From c99ef7b9ca72ca91db83578cbe03264051e01655 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 18 Oct 2008 18:57:19 +0000
Subject: [PATCH] Use system getopt_long() when available.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3097 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog               |  1 +
 sc2/build.vars.in           |  7 ++++---
 sc2/build/unix/build.config |  4 ++--
 sc2/src/Makeinfo            | 10 +++-------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index b78ec6384..18dfa0341 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Use system getopt_long() when available - SvdB
 - Added --addondir commandline option - Mika
 - Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB
 - Added read-ahead buffering when reading zip index files. - SvdB
diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index 9016e5fa8..13dc908ac 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -40,6 +40,7 @@ uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@'
 uqm_SOUNDMODULE='@SOUNDMODULE@'
 uqm_OGGVORBIS='@OGGVORBIS@'
 uqm_USE_INTERNAL_MIKMOD='@USE_INTERNAL_MIKMOD@'
+uqm_HAVE_GETOPT_LONG='@HAVE_GETOPT_LONG@'
 uqm_HAVE_REGEX='@HAVE_REGEX_H_FLAG@'
 uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
@@ -52,7 +53,7 @@ MACRO_WIN32='@MACRO_WIN32@'
 MACRO___MINGW32__='@MACRO___MINGW32__@'
 export BUILD_SYSTEM HOST_SYSTEM DEBUG
 export MACRO_WIN32 MACRO___MINGW32__
-export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK
-export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_THREADLIB
-export uqm_NETPLAY
+export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_GETOPT_LONG
+export uqm_HAVE_REGEX uqm_USE_WINSOCK uqm_HAVE_OPENGL uqm_USE_ZIP_IO
+export uqm_USE_PLATFORM_ACCEL uqm_THREADLIB uqm_NETPLAY
 
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index d79ef4bec..e5d3f262a 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -432,8 +432,8 @@ uqm_process_config() {
 			PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
 			MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
 			OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \
-			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
-			USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
+			HAVE_OPENGL HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \
+			USE_ZIP_IO USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES $HAVE_SYMBOLS"
 	SUBSTITUTE_FILES="build.vars"
diff --git a/sc2/src/Makeinfo b/sc2/src/Makeinfo
index 687cb4947..5968fa28c 100644
--- a/sc2/src/Makeinfo
+++ b/sc2/src/Makeinfo
@@ -1,12 +1,8 @@
 uqm_SUBDIRS="sc2code res"
 
-case "$HOST_SYSTEM" in
-	ARMV5|GCCE|WINSCW)
-		;;
-	*)
-		uqm_SUBDIRS="$uqm_SUBDIRS getopt"
-		;;
-esac
+if [ "$uqm_HAVE_GETOPT_LONG" = 0 ]; then
+	uqm_SUBDIRS="$uqm_SUBDIRS getopt"
+fi
 
 case "$HOST_SYSTEM" in
 	Darwin)