* 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.

keyserver/gpgkeys_hkp.c

@@ -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