Accept .uqm as file name extension for packages.

Activated regex support in uio. Including fallback regex library for this.


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

sc2/build/unix/build.config

@@ -48,8 +48,9 @@ uqm_requirements()
 	define_have_type wint_t
 
 
-	# Check for getopt.h
+	# Add defines for HAVE_GETOPT_H and HAVE_REGEX_H
 	define_have_header getopt.h
+	define_have_header regex.h
 }
 
 uqm_prepare_config()
@@ -231,8 +232,8 @@ uqm_process_config() {
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
 
 	# Make build.vars from build.vars.in, substituting variables.
-	SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SOUNDMODULE HAVE_OPENGL \
-			USE_ZIP_IO \
+	SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SOUNDMODULE \
+			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES"
 	SUBSTITUTE_FILES="build.vars"

sc2/build/unix/config_functions

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-BUILDLOG=/dev/null
+BUILDLOG=/tmp/build.log
 TEMPFILE="/tmp/build.$$.tmp"
 
 # Description: prints a command to stdout and then executes it
@@ -75,7 +75,14 @@ try_compile_c() {
 	echo_and_perform $COMPILE $1 $2 "$TEMPFILE.c" \
 			-o "$TEMPFILE.out" >> "$BUILDLOG" 2>&1
 	RESULT=$?
+	if [ $RESULT -ne 0 ]; then
+		echo "Failed program was:" >> "$BUILDLOG"
+		echo "+++ START $TEMPFILE.c" >> "$BUILDLOG"
+		cat "$TEMPFILE.c" >> "$BUILDLOG"
+		echo "+++ END $TEMPFILE.c" >> "$BUILDLOG"
+	fi
 	rm -f "$TEMPFILE.c" "$TEMPFILE.out"
+	echo >> "$BUILDLOG"
 	return $RESULT
 }
 
@@ -99,6 +106,7 @@ try_compile_and_run_c() {
 	"$TEMPFILE.out"
 	RESULT=$?
 	rm -f -- "$TEMPFILE.out"
+	echo >> "$BUILDLOG"
 	return $RESULT
 }
 
@@ -344,7 +352,9 @@ have_symbol_generic() {
 	fi
 
 	try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1
+#include <sys/types.h>
 $EXTRA
+
 $CODE
 EOF
 }
@@ -356,11 +366,6 @@ have_symbol() {
 	SYMBOL="$1"
 
 	CODE=`cat << EOF	
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 int main(void) {
 	(void) $SYMBOL;
 	return 0;
@@ -384,11 +389,6 @@ have_type() {
 	TYPE="$1"
 
 	CODE=`cat << EOF	
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 int main(void) {
 	$TYPE var;
 	(void) var;
@@ -418,8 +418,10 @@ EOF
 `
 	if have_symbol "$1"; then
 		add_symbol "HAVE_$NAME" "#define HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 1
 	else
 		add_symbol "HAVE_$NAME" "#undef HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 0
 	fi
 }
 
@@ -435,18 +437,24 @@ EOF
 `
 	if have_type "$1"; then
 		add_symbol "HAVE_$NAME" "#define HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 1
 	else
 		add_symbol "HAVE_$NAME" "#undef HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 0
 	fi
 }
 
 # Description: check if a header is available.
 # Arguments:   $1 - the name of the header file
 have_header() {
-	local HEADER
+	local HEADER NAME EXTRA
 	HEADER="$1"
 
+	NAME=${HEADER%.h}
+	EXTRA=`evalVar HEADER_${NAME}_EXTRA`
+
 	try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1
+$EXTRA
 #include <$HEADER>
 int main() {
 	return 0;
@@ -472,8 +480,10 @@ EOF
 `
 	if have_header "$1"; then
 		add_symbol "HAVE_$NAME" "#define HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 1
 	else
 		add_symbol "HAVE_$NAME" "#undef HAVE_$NAME"
+		add_symbol "HAVE_${NAME}_FLAG" 0
 	fi
 }
 
@@ -503,9 +513,11 @@ EOF
 	if [ $? -eq 0 ]; then
 		build_message "Big-endian machine."
 		add_symbol WORDS_BIGENDIAN "#define WORDS_BIGENDIAN"
+		add_symbol "WORDS_BIGENDIAN_FLAG" 1
 	else
 		build_message "Little-endian machine."
 		add_symbol WORDS_BIGENDIAN "#undef WORDS_BIGENDIAN"
+		add_symbol "WORDS_BIGENDIAN_FLAG" 0
 	fi
 }
 

sc2/build/unix/config_proginfo

@@ -256,17 +256,19 @@ LIB_zlib_DEPEND_DETECT_BIN="pkgconfig"
 # Describe the symbols (possibly) used:                                      #
 ##############################################################################
 
-SYMBOL_readdir_r_EXTRA="#include <sys/types.h>
-#include <dirent.h>
-"
+HEADER_regex_EXTRA="#include <sys/types.h>"
 
-SYMBOL_wchar_t_EXTRA="#include <stddef.h>
-"
+SYMBOL_readdir_r_EXTRA="#include <dirent.h>"
 
-SYMBOL_wint_t_EXTRA="#include <wchar.h>
-"
+SYMBOL_setenv_EXTRA="#include <stdlib.h>"
 
-SYMBOL_iswgraph_EXTRA="#include <wctype.h>
-"
+SYMBOL_stricmp_EXTRA="#include <string.h>"
 
+SYMBOL_strupr_EXTRA="#include <string.h>"
+
+SYMBOL_wchar_t_EXTRA="#include <stddef.h>"
+
+SYMBOL_wint_t_EXTRA="#include <wchar.h>"
+
+SYMBOL_iswgraph_EXTRA="#include <wctype.h>"