diff options
| author | Werner Koch <[email protected]> | 2015-08-17 14:13:25 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-08-17 14:17:19 +0000 |
| commit | 91357b7722f2bf0d3765ec72855bdc96732df9d6 (patch) | |
| tree | 73d914981a306f9dc149f580381b63ad5aa150fa /kbx/keybox-search.c | |
| parent | Fix pinentry loopback and passphrase contraints. (diff) | |
| download | gnupg-91357b7722f2bf0d3765ec72855bdc96732df9d6.tar.gz gnupg-91357b7722f2bf0d3765ec72855bdc96732df9d6.zip | |
gpg: Avoid linking to Libksba
* kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
* sm/Makefile.am (AM_CPPFLAGS): Define it here.
(common_libs): Change to libkeybox509.a
* g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
(gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
* kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
(libkeybox509_a_SOURCES): New.
(libkeybox_a_CFLAGS): New.
(libkeybox509_a_CFLAGS): New.
(kbxutil_CFLAGS): New.
* kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
as unused.
--
There is no real need to link to Libksba in gpg.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keybox-search.c')
| -rw-r--r-- | kbx/keybox-search.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 1433591c1..05b6859d2 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -611,6 +611,9 @@ has_keygrip (KEYBOXBLOB blob, const unsigned char *grip) #ifdef KEYBOX_WITH_X509 if (blob_get_type (blob) == KEYBOX_BLOBTYPE_X509) return blob_x509_has_grip (blob, grip); +#else + (void)blob; + (void)grip; #endif return 0; } |