Add getopt detection.

include/ac/unistd.h

@@ -3,11 +3,24 @@
 #ifndef _AC_UNISTD_H
 #define _AC_UNISTD_H
 
-#if HAVE_UNISTD_H
+#if HAVE_SYS_TYPES_H
 # include <sys/types.h>
+#endif
+
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
+/* getopt() defines may be in separate include file */
+#if HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+
+#ifndef HAVE_GETOPT
+/* no getopt, assume we need getopt-compat.h */
+# include <getopt-compat.h>
+#endif
+
 /* use _POSIX_VERSION for POSIX.1 code */
 
 #endif /* _AC_UNISTD_H */

include/portable.h.in

@@ -230,6 +230,9 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
+/* Define if you have the getopt function.  */
+#undef HAVE_GETOPT
+
 /* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 
@@ -323,6 +326,9 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the <gdbm.h> header file.  */
 #undef HAVE_GDBM_H
 
+/* Define if you have the <getopt.h> header file.  */
+#undef HAVE_GETOPT_H
+
 /* Define if you have the <kerberosIV/des.h> header file.  */
 #undef HAVE_KERBEROSIV_DES_H
 

include/portable.h.nt

@@ -245,6 +245,9 @@ typedef char * caddr_t;
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME 1
 
+/* define if you have the getopt function */
+#undef HAVE_GETOPT
+
 /* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 
@@ -285,7 +288,7 @@ typedef char * caddr_t;
 #undef HAVE_SIGSET
 
 /* Define if you have the socket function.  */
-#undef HAVE_SOCKET
+#define HAVE_SOCKET 1
 
 /* Define if you have the strdup function.  */
 #define HAVE_STRDUP 1
@@ -338,6 +341,9 @@ typedef char * caddr_t;
 /* Define if you have the <gdbm.h> header file.  */
 #undef HAVE_GDBM_H
 
+/* Define if you have the <getopt.h> header file.  */
+#undef HAVE_GETOPT_H
+
 /* Define if you have the <kerberosIV/des.h> header file.  */
 #undef HAVE_KERBEROSIV_DES_H
 
@@ -405,7 +411,7 @@ typedef char * caddr_t;
 #undef HAVE_SYS_PARAM_H
 
 /* Define if you have the <sys/socket.h> header file.  */
-#define HAVE_SYS_SOCKET_H 1
+#undef HAVE_SYS_SOCKET_H
 
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H