1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-24 10:39:57 +01:00

* 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.
This commit is contained in:
David Shaw 2003-05-28 22:29:04 +00:00
parent dcff0d959e
commit b54375f552
4 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2003-05-28 David Shaw <dshaw@jabberwocky.com>
* 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 <dshaw@jabberwocky.com> 2003-03-23 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: gpgkeys_hkp needs @INTLLIBS@ on some platforms. * Makefile.am: gpgkeys_hkp needs @INTLLIBS@ on some platforms.

View File

@ -23,12 +23,9 @@ EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp
EXTRA_SCRIPTS = gpgkeys_mailto EXTRA_SCRIPTS = gpgkeys_mailto
libexecdir = @libexecdir@/@PACKAGE@ libexecdir = @libexecdir@/@PACKAGE@
# We don't need the libs the regular GPG binaries do
LIBS=
libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@
libexec_SCRIPTS = @GPGKEYS_MAILTO@ libexec_SCRIPTS = @GPGKEYS_MAILTO@
noinst_SCRIPTS = gpgkeys_test noinst_SCRIPTS = gpgkeys_test
gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@

View File

@ -25,6 +25,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#define INCLUDED_BY_MAIN_MODULE 1 #define INCLUDED_BY_MAIN_MODULE 1
#include "util.h" #include "util.h"
#include "http.h" #include "http.h"

View File

@ -23,6 +23,9 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#ifdef NEED_LBER_H #ifdef NEED_LBER_H