Some small portability improvements.

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

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_H and HAVE_REGEX_H
-	define_have_header getopt.h
+	# Add defines for HAVE_GETOPT_LONG and HAVE_REGEX_H
+	define_have_symbol getopt_long
 	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 \