| skipped 480 lines |
| 481 | 481 | | define-append CFLAGS -D_FILE_OFFSET_BITS=[get-define _FILE_OFFSET_BITS] |
| 482 | 482 | | } |
| 483 | 483 | | |
| 484 | | - | msg-checking "Checking for GPGME..." |
| 485 | | - | if {1} { |
| 486 | | - | # Locate gpgme-config |
| 487 | | - | set gpgme_prefix [opt-val with-gpgme $prefix] |
| 488 | | - | set gpgme_config_guess [file join $gpgme_prefix bin gpgme-config] |
| 489 | | - | if {[file-isexec $gpgme_config_guess]} { |
| 490 | | - | define GPGME-CONFIG $gpgme_config_guess |
| 491 | | - | } else { |
| 492 | | - | if {![cc-check-progs gpgme-config]} { |
| 493 | | - | user-error "Unable to find gpgme-config" |
| 494 | | - | } |
| 495 | | - | } |
| 496 | | - | set gpgme_config [get-define GPGME-CONFIG] |
| | 484 | + | pkgconf true gpgme |
| | 485 | + | pkgconf true gpg-error |
| 497 | 486 | | |
| 498 | | - | # Version |
| 499 | | - | if {[catch {exec-with-stderr $gpgme_config --version} gpgme_version err]} { |
| 500 | | - | user-error "Could not derive --version from $gpgme_config" |
| 501 | | - | } |
| 502 | | - | if {[scan $gpgme_version "%d.%d.%d" gpgme_maj gpgme_min gpgme_patch] != 3} { |
| 503 | | - | user-error "Could not parse GPGME version $gpgme_version" |
| 504 | | - | } |
| 505 | | - | msg-result $gpgme_version |
| 506 | | - | if {[get-define want-autocrypt]} { |
| 507 | | - | if {$gpgme_maj < 1 || $gpgme_min < 8} { |
| 508 | | - | # GPGME v1.8.0 was released on 2016-11-16 |
| 509 | | - | user-error "Found GPGME version $gpgme_version, need 1.8.0 for AutoCrypt" |
| 510 | | - | } |
| 511 | | - | } else { |
| 512 | | - | if {$gpgme_maj < 1 || $gpgme_min < 4} { |
| 513 | | - | # GPGME v1.4.0 was released on 2013-02-26 |
| 514 | | - | user-error "Found GPGME version $gpgme_version, need 1.4.0" |
| 515 | | - | } |
| 516 | | - | } |
| 517 | | - | define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj $gpgme_min $gpgme_patch] |
| | 487 | + | # Version might look like this: 1.13.1-unknown, so split on both '.' and '-' |
| | 488 | + | lassign [split [get-define PKG_GPGME_VERSION] .-] gpgme_maj gpgme_min gpgme_patch |
| 518 | 489 | | |
| 519 | | - | # CFLAGS |
| 520 | | - | if {[catch {exec-with-stderr $gpgme_config --cflags} res err]} { |
| 521 | | - | user-error "Could not derive --cflags from $gpgme_config" |
| 522 | | - | } |
| 523 | | - | define-append CFLAGS $res |
| 524 | | - | |
| 525 | | - | # LIBS |
| 526 | | - | if {[catch {exec-with-stderr $gpgme_config --libs} res err]} { |
| 527 | | - | user-error "Could not derive --libs from $gpgme_config" |
| 528 | | - | } |
| 529 | | - | define-append LIBS $res |
| 530 | | - | } |
| 531 | | - | define-feature gpgme |
| 532 | | - | |
| 533 | | - | pkgconf true gpg-error |
| | 490 | + | define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj $gpgme_min $gpgme_patch] |
| 534 | 491 | | define CRYPT_BACKEND_GPGME |
| 535 | 492 | | } |
| 536 | 493 | | |
| skipped 734 lines |
Pietro Cerutti
committed
with
Richard Russon
2 years ago
1 parent 8459f6d0