Getopt() fixes, from Max Horn.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@351 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/Makeinfo

@@ -1,4 +1,4 @@
-uqm_SUBDIRS=sc2code
+uqm_SUBDIRS="sc2code getopt"
 uqm_CFILES="options.c port.c starcon2.c"
 
 test_CFILES=test.c

sc2/src/config.h.in

@@ -10,3 +10,6 @@
 /* Defined if your system has stricmp of its own */
 @HAVE_STRICMP@
 
+/* Defined if your system has getopt.h */
+@HAVE_GETOPT_H@
+

sc2/src/getopt/Makeinfo

@@ -0,0 +1 @@
+uqm_CFILES="getopt.c getopt1.c"

sc2/src/getopt/getopt.c

@@ -31,6 +31,7 @@
 # include <config.h>
 #endif
 
+#ifndef HAVE_GETOPT_H
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
@@ -1057,3 +1058,5 @@ main (argc, argv)
 }
 
 #endif /* TEST */
+
+#endif /* HAVE_GETOPT_H */

sc2/src/getopt/getopt1.c

@@ -22,6 +22,7 @@
 #include <config.h>
 #endif
 
+#ifndef HAVE_GETOPT_H
 #include "getopt.h"
 
 #if !defined __STDC__ || !__STDC__
@@ -186,3 +187,5 @@ main (argc, argv)
 }
 
 #endif /* TEST */
+
+#endif /* HAVE_GETOPT_H */

sc2/src/starcon2.c

@@ -18,10 +18,14 @@
 
 #ifndef WIN32
 #include <unistd.h>
-#include <getopt.h>
 #include "config.h"
 #else
 #include <direct.h>
+#endif
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
 #include "getopt/getopt.h"
 #endif