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

* gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is available.

Also include extern references for optarg and optind since there is no
guarantee that any header file will include them.  Standards?  We don't
need no stinkin' standards

* Makefile.am: Use @GETOPT@ to pull in libiberty on those platforms that
need it.
This commit is contained in:
David Shaw 2003-05-31 03:52:02 +00:00
parent 5d3b948c8a
commit 0a86b45b9d
4 changed files with 24 additions and 5 deletions

View File

@ -1,3 +1,13 @@
2003-05-30 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is
available. Also include extern references for optarg and optind
since there is no guarantee that any header file will include
them. Standards? We don't need no stinkin' standards
* Makefile.am: Use @GETOPT@ to pull in libiberty on those
platforms that need it.
2003-04-08 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (dehtmlize, parse_hkp_index): Fix memory

View File

@ -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@ @SRVLIBS@ @INTLLIBS@ @CAPLIBS@
gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@

View File

@ -25,11 +25,17 @@
#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"
#include "keyserver.h"
extern char *optarg;
extern int optind;
#define GET 0
#define SEND 1
#define SEARCH 2

View File

@ -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
@ -35,6 +38,9 @@
#include "util.h"
#endif
extern char *optarg;
extern int optind;
#define GET 0
#define SEND 1
#define SEARCH 2