diff options
| author | David Shaw <[email protected]> | 2003-05-28 22:29:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-28 22:29:04 +0000 |
| commit | b54375f5527c4dfa0a25da47745caa442e06790b (patch) | |
| tree | bb0e64bd7051ecd839b2c3b565b90c9556e32f6d | |
| parent | * Makefile.am: Some cleanup, and use DLLIBS for -ldl. (diff) | |
| download | gnupg-b54375f5527c4dfa0a25da47745caa442e06790b.tar.gz gnupg-b54375f5527c4dfa0a25da47745caa442e06790b.zip | |
* gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is available.
* Makefile.am: Use @GETOPT@ to pull in libiberty on those platforms that
need it.
| -rw-r--r-- | keyserver/ChangeLog | 8 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 7 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 3 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 3 |
4 files changed, 16 insertions, 5 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 9a8e7d4af..7f63135ee 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,11 @@ +2003-05-28 David Shaw <[email protected]> + + * gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is + available. + + * Makefile.am: Use @GETOPT@ to pull in libiberty on those + platforms that need it. + 2003-03-23 David Shaw <[email protected]> * Makefile.am: gpgkeys_hkp needs @INTLLIBS@ on some platforms. diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index b10e56e27..dd6bf7ffb 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -23,12 +23,9 @@ EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp EXTRA_SCRIPTS = gpgkeys_mailto libexecdir = @libexecdir@/@PACKAGE@ -# We don't need the libs the regular GPG binaries do -LIBS= - libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ +gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 859b33d6d..fc3943eaa 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -25,6 +25,9 @@ #include <stdlib.h> #include <errno.h> #include <unistd.h> +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#endif #define INCLUDED_BY_MAIN_MODULE 1 #include "util.h" #include "http.h" diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 0a06f2f23..aad578cfb 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -23,6 +23,9 @@ #include <string.h> #include <time.h> #include <unistd.h> +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#endif #include <stdlib.h> #include <errno.h> #ifdef NEED_LBER_H |