check for getopt.h

dtool/Config.Irix.pp

@@ -39,6 +39,9 @@
 #define HAVE_GETOPT 1
 #define HAVE_GETOPT_LONG_ONLY
 
+// Are the above getopt() functions defined in getopt.h, or somewhere else?
+#define HAVE_GETOPT_H 1
+
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
 

dtool/Config.Linux.pp

@@ -42,6 +42,9 @@
 #define HAVE_GETOPT 1
 #define HAVE_GETOPT_LONG_ONLY 1
 
+// Are the above getopt() functions defined in getopt.h, or somewhere else?
+#define HAVE_GETOPT_H 1
+
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
 

dtool/Config.Win32.pp

@@ -42,6 +42,9 @@
 #define HAVE_GETOPT
 #define HAVE_GETOPT_LONG_ONLY
 
+// Are the above getopt() functions defined in getopt.h, or somewhere else?
+#define HAVE_GETOPT_H
+
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH
 

dtool/LocalSetup.pp

@@ -173,6 +173,9 @@ $[cdefine HAVE_GETOPT]
 /* Define if you have the getopt_long_only function.  */
 $[cdefine HAVE_GETOPT_LONG_ONLY]
 
+/* Define if getopt appears in getopt.h.  */
+$[cdefine HAVE_GETOPT_H]
+
 /* Define if you have ioctl(TIOCGWINSZ) to determine terminal width. */
 $[cdefine IOCTL_TERMINAL_WIDTH]
 

dtool/src/dtoolbase/dtoolbase.h

@@ -113,7 +113,6 @@
 #include <sys/time.h>
 #endif
 
-
 #ifdef CPPPARSER
 #include <stdtypedefs.h>
 #endif

dtool/src/interrogate/interrogate.cxx

@@ -19,17 +19,19 @@
 #include "interrogate.h"
 #include "interrogateBuilder.h"
 
-#include <interrogateDatabase.h>
-#include <cppGlobals.h>
-#include <notify.h>
+#include "interrogateDatabase.h"
+#include "cppGlobals.h"
+#include "notify.h"
 #include <time.h>
 
 // If our system getopt() doesn't come with getopt_long_only(), then use
 // the GNU flavor that we've got in tool for this purpose.
 #ifndef HAVE_GETOPT_LONG_ONLY
-#include <gnu_getopt.h>
+#include "gnu_getopt.h"
 #else
-#include <getopt.h>
+  #ifdef HAVE_GETOPT_H
+    #include <getopt.h>
+  #endif
 #endif
 
 CPPParser parser;

dtool/src/interrogate/interrogate.h

@@ -19,11 +19,11 @@
 #ifndef INTERROGATE_H
 #define INTERROGATE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
-#include <cppParser.h>
-#include <cppVisibility.h>
-#include <filename.h>
+#include "cppParser.h"
+#include "cppVisibility.h"
+#include "filename.h"
 
 extern CPPParser parser;
 

ppremake/configure.in

@@ -42,7 +42,7 @@ AC_SUBST(libm)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(malloc.h alloca.h unistd.h utime.h io.h minmax.h dirent.h sys/types.h sys/time.h sys/utime.h sys/wait.h string.h regex.h)
+AC_CHECK_HEADERS(malloc.h alloca.h unistd.h utime.h io.h minmax.h dirent.h sys/types.h sys/time.h sys/utime.h sys/wait.h string.h regex.h getopt.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 

ppremake/ppremake.cxx

@@ -11,10 +11,12 @@
 #include "sedProcess.h"
 
 #ifdef HAVE_GETOPT
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif  // HAVE_GETOPT_H
 #else
 #include "gnu_getopt.h"
-#endif
+#endif  // HAVE_GETOPT
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>