Some small portability improvements.

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

sc2/build.vars.in

@@ -17,8 +17,8 @@
 
 BUILD_SYSTEM='@BUILD_SYSTEM@'
 HOST_SYSTEM='@HOST_SYSTEM@'
-COMPILE=gcc
+COMPILE='@COMPILE@'
-MKDEPEND='gcc -MM'
+MKDEPEND='@COMPILE@ -MM'
 MAKE='@MAKE@'
 ECHON='@ECHON@'
 SED='@SED@'

sc2/build/unix/build.config

@@ -33,7 +33,7 @@ uqm_requirements()
 	use_library SDL_image || exit 1
 
 
-	# Add defines for HAVE_READDIR_R, HAVE_SETENV, HAVE_STRUPR
+	# Add defines for HAVE_READDIR_R, HAVE_SETENV, HAVE_STRUPR,
 	# and HAVE_STRICMP
 	define_have_symbol readdir_r
 	define_have_symbol setenv
@@ -45,9 +45,8 @@ uqm_requirements()
 	define_have_type wchar_t
 	define_have_type wint_t
 
-
+	# Add defines for HAVE_GETOPT_LONG and HAVE_REGEX_H
-	# Add defines for HAVE_GETOPT_H and HAVE_REGEX_H
+	define_have_symbol getopt_long
-	define_have_header getopt.h
 	define_have_header regex.h
 }
 
@@ -279,7 +278,8 @@ uqm_process_config() {
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
 
 	# Make build.vars from build.vars.in, substituting variables.
-	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \
+	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM COMPILE \
+			CFLAGS LDFLAGS MAKE \
 			ECHON DEBUG SED SOUNDMODULE \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
 			USE_PLATFORM_ACCEL \

sc2/build/unix/config_proginfo_host

@@ -235,4 +235,6 @@ SYMBOL_wint_t_EXTRA="#include <wchar.h>"
 
 SYMBOL_iswgraph_EXTRA="#include <wctype.h>"
 
+SYMBOL_getopt_long_EXTRA="#include <getopt.h>"
+
 

sc2/src/config_unix.h.in

@@ -40,8 +40,8 @@
 /* Defined if your system has stricmp of its own */
 @HAVE_STRICMP@
 
-/* Defined if your system has getopt.h */
+/* Defined if your system has getopt_long */
-@HAVE_GETOPT_H@
+@HAVE_GETOPT_LONG@
 
 /* Defined if your system has iswgraph of its own*/
 @HAVE_ISWGRAPH@

sc2/src/getopt/getopt.c

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

sc2/src/getopt/getopt1.c

@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#ifndef HAVE_GETOPT_H
+#ifndef HAVE_GETOPT_LONG
 #include "getopt.h"
 
 #if !defined __STDC__ || !__STDC__
@@ -186,4 +186,4 @@ main (argc, argv)
 
 #endif /* TEST */
 
-#endif /* HAVE_GETOPT_H */
+#endif /* HAVE_GETOPT_LONG */

sc2/src/msvc++/config.h

@@ -41,8 +41,8 @@
 /* Defined if your system has stricmp of its own */
 #define HAVE_STRICMP
 
-/* Defined if your system has getopt.h */
+/* Defined if your system has getopt_long */
-#undef HAVE_GETOPT_H
+#undef HAVE_GETOPT_LONG
 
 /* Defined if your system has iswgraph of its own*/
 #define HAVE_ISWGRAPH

sc2/src/sc2code/libs/sound/decoders/wav.c

@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <memory.h>
 #include "port.h"
 #include "types.h"
 #include "uio.h"

sc2/src/starcon2.c

@@ -20,7 +20,7 @@
 #	include <unistd.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
+#ifdef HAVE_GETOPT_LONG
 #	include <getopt.h>
 #else
 #	include "getopt/getopt.h"