Changeset 1975

Timestamp:

08/12/2007 23:44:17 (3 years ago)

Author:

chris

Message:

Fix getopt reset for solaris and maybe other platforms. See
 http://lists.debian.org/debian-glibc/2004/10/msg00070.html.
(merges [1930] [1974] plus local change for Win32)

Location:

box/chris/general

Files:

• configure.ac (modified) (4 diffs)
• lib/server/Daemon.cpp (modified) (1 diff)

box/chris/general/configure.ac

@@ -42 +42 @@
 AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$TARGET_PERL"], 
         [Location of the perl executable])
+
+AC_CHECK_PROGS([AR],     [ar],    
+        [AC_MSG_ERROR([[cannot find ar executable]])])
+AC_CHECK_PROGS([RANLIB], [ranlib],
+        [AC_MSG_ERROR([[cannot find ranlib executable]])])
 
 ### Checks for libraries.
@@ -138 +143 @@
 AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t, u_int64_t])
 AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, uint64_t])
+
 AC_HEADER_STDBOOL
 AC_C_CONST
@@ -147 +153 @@
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+
 AC_CHECK_MEMBERS([struct stat.st_flags])
 AC_CHECK_MEMBERS([struct stat.st_mtimespec])
@@ -153 +160 @@
   #include <netinet/in.h>
   ]])
+
 AC_CHECK_DECLS([INFTIM],,, [[#include <poll.h>]])
 AC_CHECK_DECLS([SO_PEERCRED],,, [[#include <sys/socket.h>]])
 AC_CHECK_DECLS([O_BINARY],,,)
+
+AC_CHECK_DECLS([optreset],,, [[#include <getopt.h>]])
+AC_CHECK_DECL([dirfd],
+        [],
+        AC_DEFINE([dirfd(x)], [(x)->d_fd], [dirfd() replacement for Solaris]),
+        [#include <getopt.h>])
+
 AC_HEADER_TIME
 AC_STRUCT_TM

box/chris/general/lib/server/Daemon.cpp

@@ -277 +277 @@
         // unfortunately glibc and BSD differ on this point!
         // http://www.ussg.iu.edu/hypermail/linux/kernel/0305.3/0262.html
-        #ifdef __GLIBC__
-                optind = 0;
-        #else
+        #if HAVE_DECL_OPTRESET == 1 || defined WIN32
                 optind = 1;
                 optreset = 1;
+        #elif defined __GLIBC__
+                optind = 0;
+        #else // Solaris, any others?
+                optind = 1;
         #endif