--- trunk/configure	2007/10/08 16:20:40	30
+++ trunk/configure	2007/10/08 16:22:32	42
@@ -1,7 +1,7 @@
 #!/bin/sh
 ###############################################################################
 #
-#  Copyright (C) 2003-2006  Anders Gavare.  All rights reserved.
+#  Copyright (C) 2003-2007  Anders Gavare.  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions are met:
@@ -27,7 +27,7 @@
 #  SUCH DAMAGE.
 #
 #
-#  $Id: configure,v 1.228 2006/07/25 21:49:14 debug Exp $
+#  $Id: configure,v 1.270 2007/06/15 17:13:40 debug Exp $
 #
 #  This is a minimal configure script, hardcoded for GXemul. This script
 #  figures out which compiler flags will work, and creates Makefiles in
@@ -50,7 +50,6 @@
 #    o)  X11 flags and libraries  (TODO: should be possible to override
 #	 via command line options?)
 #
-#
 #  The general philosophy regarding command line switches is that anything
 #  which can be incorporated into the program as a runtime command line option
 #  should be, instead of requiring a recompile.
@@ -60,31 +59,11 @@
 #  Figure out if this is a stable version (0.x.x).
 X=`basename \`pwd\`|cut -d \- -f 2-|cut -c1-2`
 if [ z"$X" = z0. ]; then
-	#  Stable:
-	ENABLEALPHA=YES
-	ENABLEARM=YES
-	ENABLEMIPS=YES
-	ENABLEPPC=YES
+	#  Stable.
+	:
 else
-	#  Development:
+	#  Development.
 	UNSTABLE=YES
-	ENABLEALPHA=YES
-	ENABLEARM=YES
-	ENABLEAVR=YES
-	ENABLEHPPA=YES
-	ENABLEI960=YES
-	ENABLEIA64=YES
-	ENABLEM68K=YES
-	ENABLEMIPS=YES
-	ENABLEPPC=YES
-	ENABLESH=YES
-	ENABLESPARC=YES
-	ENABLETRANSPUTER=YES
-	ENABLEX86=YES
-fi
-
-if [ z"$UNSTABLE" = zYES ]; then
-	printf "###\n###  DEVELOPMENT (UNSTABLE)\n###\n\n"
 fi
 
 if [ z"$*" != z ]; then
@@ -92,10 +71,16 @@
 	for a in $*; do
 		if [ z$a = z--disable-x ]; then
 			NOX11=YES
+		else if [ z$a = z--debug ]; then
+			DEBUG=YES
 		else if [ z$a = z--help ]; then
 			printf "usage: $0 [options]\n\n"
 			echo "  --disable-x         don't include X11 support,"\
 			    "even if the host supports it"
+			if [ z"$UNSTABLE" = zYES ]; then
+				echo "  --debug             configure" \
+					"for a debug build"
+			fi
 			echo
 			exit
 		else
@@ -103,7 +88,7 @@
 			echo "Run  $0 --help  to get a list of" \
 			    "available options."
 			exit
-		fi; fi
+		fi; fi; fi
 	done
 fi
 
@@ -135,6 +120,8 @@
 
 if [ z"$UNSTABLE" = zYES ]; then
 	printf "#define UNSTABLE_DEVEL\n" >> config.h
+else
+	CFLAGS="-DNDEBUG $CFLAGS"
 fi
 
 
@@ -142,86 +129,66 @@
 printf "#define COMPILE_DATE \"$ZZ\"\n" >> config.h
 
 
+#  Include support for all CPU types:
+printf "#define ADD_ALL_CPU_FAMILIES    " >> config.h
 
-#  Support for various CPU types:
-if [ z$ENABLEALPHA = zYES ]; then
-	printf "#define ENABLE_ALPHA\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_alpha.o cpu_alpha_palcode.o memory_alpha.o"
-	CPU_TOOLS="$CPU_TOOLS generate_alpha_misc"
-fi
-if [ z$ENABLEARM = zYES ]; then
-	printf "#define ENABLE_ARM\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_arm.o cpu_arm_coproc.o memory_arm.o "
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_dpi.o tmp_arm_loadstore.o tmp_arm_r.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_r0.o tmp_arm_r1.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_r2.o tmp_arm_r3.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_r4.o tmp_arm_r5.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_r6.o tmp_arm_r7.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_r8.o tmp_arm_r9.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_ra.o tmp_arm_rb.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_rc.o tmp_arm_rd.o"
-	CPU_ARCHS="$CPU_ARCHS tmp_arm_re.o tmp_arm_rf.o tmp_arm_multi.o"
-	CPU_TOOLS="$CPU_TOOLS generate_arm_dpi generate_arm_r"
-	CPU_TOOLS="$CPU_TOOLS generate_arm_loadstore generate_arm_multi"
-fi
-if [ z$ENABLEAVR = zYES ]; then
-	printf "#define ENABLE_AVR\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_avr.o"
-fi
-if [ z$ENABLEHPPA = zYES ]; then
-	printf "#define ENABLE_HPPA\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_hppa.o"
-fi
-if [ z$ENABLEI960 = zYES ]; then
-	printf "#define ENABLE_I960\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_i960.o"
-fi
-if [ z$ENABLEIA64 = zYES ]; then
-	printf "#define ENABLE_IA64\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_ia64.o"
-fi
-if [ z$ENABLEM68K = zYES ]; then
-	printf "#define ENABLE_M68K\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_m68k.o"
-fi
-if [ z$ENABLEMIPS = zYES ]; then
-	printf "#define ENABLE_MIPS\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_mips.o cpu_mips_coproc.o "
-	CPU_ARCHS="$CPU_ARCHS cpu_mips_instr_unaligned.o"
-	CPU_TOOLS="$CPU_TOOLS generate_mips_loadstore"
-fi
-if [ z$ENABLEPPC = zYES ]; then
-	printf "#define ENABLE_PPC\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_ppc.o"
-	CPU_TOOLS="$CPU_TOOLS generate_ppc_loadstore"
-fi
-if [ z$ENABLESH = zYES ]; then
-	printf "#define ENABLE_SH\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_sh.o memory_sh.o"
-fi
-if [ z$ENABLESPARC = zYES ]; then
-	printf "#define ENABLE_SPARC\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_sparc.o"
-	CPU_TOOLS="$CPU_TOOLS generate_sparc_loadstore"
-fi
-if [ z$ENABLETRANSPUTER = zYES ]; then
-	printf "#define ENABLE_TRANSPUTER\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_transputer.o"
-fi
-if [ z$ENABLEX86 = zYES ]; then
-	printf "#define ENABLE_X86\n" >> config.h
-	CPU_ARCHS="$CPU_ARCHS cpu_x86.o"
-fi
-
-
-#  Cache emulation:
-if [ z$CACHES = zYES ]; then
-	echo 'Enabling Cache emulation. (EXPERIMENTAL and BUGGY)'
-	printf "#define ENABLE_CACHE_EMULATION\n" >> config.h
+#  Alpha
+printf " add_cpu_family(alpha_cpu_family_init, ARCH_ALPHA);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_alpha.o cpu_alpha_palcode.o memory_alpha.o"
+CPU_TOOLS="$CPU_TOOLS generate_alpha_misc"
+
+#  ARM
+printf " add_cpu_family(arm_cpu_family_init, ARCH_ARM);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_arm.o cpu_arm_coproc.o memory_arm.o "
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p0_u0_w0.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p0_u0_w1.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p0_u1_w0.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p0_u1_w1.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p1_u0_w0.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p1_u0_w1.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p1_u1_w0.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_loadstore_p1_u1_w1.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_dpi.o tmp_arm_r.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_r0.o tmp_arm_r1.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_r2.o tmp_arm_r3.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_r4.o tmp_arm_r5.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_r6.o tmp_arm_r7.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_r8.o tmp_arm_r9.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_ra.o tmp_arm_rb.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_rc.o tmp_arm_rd.o"
+CPU_ARCHS="$CPU_ARCHS tmp_arm_re.o tmp_arm_rf.o tmp_arm_multi.o"
+CPU_TOOLS="$CPU_TOOLS generate_arm_dpi generate_arm_r"
+CPU_TOOLS="$CPU_TOOLS generate_arm_loadstore generate_arm_multi"
+
+#  M88K
+printf " add_cpu_family(m88k_cpu_family_init, ARCH_M88K);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_m88k.o memory_m88k.o"
+CPU_TOOLS="$CPU_TOOLS generate_m88k_bcnd"
+CPU_TOOLS="$CPU_TOOLS generate_m88k_loadstore"
+
+#  MIPS
+printf " add_cpu_family(mips_cpu_family_init, ARCH_MIPS);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_mips.o cpu_mips_coproc.o "
+CPU_ARCHS="$CPU_ARCHS cpu_mips_instr_unaligned.o"
+CPU_TOOLS="$CPU_TOOLS generate_mips_loadstore"
+CPU_TOOLS="$CPU_TOOLS generate_mips_loadstore_multi"
+
+#  POWER/PowerPC
+printf " add_cpu_family(ppc_cpu_family_init, ARCH_PPC);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_ppc.o"
+CPU_TOOLS="$CPU_TOOLS generate_ppc_loadstore"
+
+#  SuperH
+printf " add_cpu_family(sh_cpu_family_init, ARCH_SH);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_sh.o memory_sh.o"
+
+#  SPARC
+printf " add_cpu_family(sparc_cpu_family_init, ARCH_SPARC);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_sparc.o memory_sparc.o"
+CPU_TOOLS="$CPU_TOOLS generate_sparc_loadstore"
 
-	printf "\nNOTE: Cache emulation enabled, but right now it triggers "
-	printf "weird bugs in the\n      emulator. You have been warned.\n\n"
-fi
+printf "\n" >> config.h
 
 
 ###############################################################################
@@ -268,38 +235,67 @@
 #\n\n" >> _Makefile.header
 
 
-echo 'int main(int argc, char *argv[]) { return 0; }' > _testprog.c
+#  Try with the simplest possible test program. Actually, test static variables
+#  as well, because GXemul uses things like NULL-initialized global pointers,
+#  and it is important that they work. (GCC on Solaris is known to be completely
+#  broken, for instance.)
+
+echo '#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+        static int x = 0;
+        static int y = 1;
+        printf("%i,%i", x, y);
+        return 0;
+}
+' > _testprog.c
 
 
 #  Try to detect which C compiler to use, if CC is not set:
 printf "checking which C compiler to use... "
-
+rm -f _testprog
 if [ z"$CC" = z ]; then
-	CC=cc
-
 	#  Try gcc first:
-	printf "#!/bin/sh\ngcc _testprog.c -o _testprog >" > _test.sh
+	printf "#!/bin/sh\ngcc $CFLAGS _testprog.c -o _testprog >" > _test.sh
 	printf " /dev/null 2> /dev/null\n" >> _test.sh
 	chmod 755 _test.sh
 	./_test.sh > /dev/null 2> /dev/null
 	if [ -x _testprog ]; then
-		CC=gcc
+		if [ z`./_testprog` = z0,1 ]; then
+			CC=gcc
+		else
+			printf "broken gcc detected\n"
+			printf "The test program:\n\n"
+			cat _testprog.c
+			printf "\nshould have resulted in 0,1, but the"
+			printf " result was: "
+			./_testprog
+			printf "\n\nchecking for other C compilers... "
+		fi
 	fi
 	rm -f _testprog
 
 	#  If both gcc and cc exist, then cc might be a vendor specific
 	#  compiler which produces faster code than gcc (eg on Solaris):
-	printf "#!/bin/sh\ncc _testprog.c -o _testprog >" > _test.sh
+	printf "#!/bin/sh\ncc $CFLAGS _testprog.c -o _testprog >" > _test.sh
 	printf " /dev/null 2> /dev/null\n" >> _test.sh
 	chmod 755 _test.sh
 	./_test.sh > /dev/null 2> /dev/null
 	if [ -x _testprog ]; then
-		CC=cc
+		if [ z`./_testprog` = z0,1 ]; then
+			CC=cc
+		else
+			printf "broken cc detected\n"
+			printf "checking for other C compilers... "
+		fi
 	fi
 	rm -f _testprog
 
+#  Actually, don't try ccc on Alpha. ccc generates broken code :(
+
 #	#  Try ccc (FreeBSD/Alpha):
-#	printf "#!/bin/sh\nccc _testprog.c -o _testprog >" > _test.sh
+#	printf "#!/bin/sh\nccc $CFLAGS _testprog.c -o _testprog >" > _test.sh
 #	printf " /dev/null 2> /dev/null\n" >> _test.sh
 #	chmod 755 _test.sh
 #	./_test.sh > /dev/null 2> /dev/null
@@ -313,6 +309,16 @@
 
 
 rm -f _testprog
+
+if [ z$CC = z ]; then
+	printf "no working compiler detected\n"
+	printf "\nPlease set the CC environment variable to a working C "
+	printf "compiler before running\nthe configure script, and make"
+	printf " sure that the CFLAGS environment variable is\nalso valid"
+	printf " for that compiler.\n"
+	exit
+fi
+
 printf "$CC $CFLAGS"
 
 
@@ -368,6 +374,20 @@
 
 	rm -f _test_x11 _test_x11.o
 
+	#  Special case for some 64-bit Linux/x86_64 systems:
+	if [ z$XOK = z0 ]; then
+		$CC $CFLAGS _test_x11.c -c -o _test_x11.o \
+		    $XINCLUDE 2> /dev/null
+
+		XLIB="-L/usr/X11R6/lib64 -lX11"
+		$CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
+
+		if [ -x _test_x11 ]; then
+			XOK=1
+		fi
+	fi
+	rm -f _test_x11 _test_x11.o
+
 	if [ z$XOK = z0 ]; then
 		XINCLUDE=""
 		$CC $CFLAGS _test_x11.c -c -o _test_x11.o \
@@ -578,27 +598,54 @@
 rm -f _testprog
 
 
+#  -Wstrict-aliasing
+if [ ! z"$DEBUG" = zYES ]; then
+	printf "checking whether -Wstrict-aliasing can be used... "
+	$CC $CFLAGS -Wstrict-aliasing _testprog.c -o \
+	    _testprog 1> _testprog.stdout 2>&1
+	cat _testprog.stdout >> _testprog.error
+	if grep frame _testprog.error > /dev/null 2>&1; then
+		printf "no\n"
+	else
+		if [ -x _testprog ]; then
+			CWARNINGS="-Wstrict-aliasing $CWARNINGS"
+			printf "yes\n"
+		else
+			printf "no\n"
+		fi
+	fi
+	rm -f _testprog _testprog.error _testprog.stdout
+fi
+
+
 if [ z"$COMPAQCC" = zYES ]; then
 	#  -O4 is possible, but sometimes -O3 is better?
-	CFLAGS="-O4 $CFLAGS"
+	if [ ! z"$DEBUG" = zYES ]; then
+		CFLAGS="-O4 $CFLAGS"
+	fi
 else
 	if [ z"`uname`" = zSunOS ]; then
 		#  "cc", the system's default compiler:
-		if [ z"$SUNCC" = zYES ]; then
-			CFLAGS="-xO5 -xdepend $CFLAGS"
+		if [ ! z"$DEBUG" = zYES ]; then
+			if [ z"$SUNCC" = zYES ]; then
+				CFLAGS="-xO5 -xdepend $CFLAGS"
+			fi
 		fi
 		printf "#define SOLARIS\n" >> config.h
 		OTHERLIBS="-lsocket $OTHERLIBS"
 	else
 		#  gcc or something else:
-		$CC $CFLAGS _testprog.c -o _testprog -O 2> /dev/null
-		if [ -x _testprog ]; then
-			rm -f _testprog
-			$CC $CFLAGS _testprog.c -o _testprog -O3 2> /dev/null
+		if [ ! z"$DEBUG" = zYES ]; then
+			$CC $CFLAGS _testprog.c -o _testprog -O 2> /dev/null
 			if [ -x _testprog ]; then
-				CFLAGS="-O3 $CFLAGS"
-			else
-				CFLAGS="-O $CFLAGS"
+				rm -f _testprog
+				$CC $CFLAGS _testprog.c -o _testprog	\
+					-O3 2> /dev/null
+				if [ -x _testprog ]; then
+					CFLAGS="-O3 $CFLAGS"
+				else
+					CFLAGS="-O $CFLAGS"
+				fi
 			fi
 		fi
 	fi
@@ -608,7 +655,8 @@
 
 #  -fschedule-insns causes bugs on i386 with gcc,
 #  but works OK on my alpha with ccc (compaq's cc).
-if [ z"$COMPAQCC" = zYES ]; then
+if [ ! z"$DEBUG" = zYES ]; then
+    if [ z"$COMPAQCC" = zYES ]; then
 	printf "checking whether -fschedule-insns2 can be used... "
 	$CC $CFLAGS _testprog.c -o _testprog -fschedule-insns2 2> /dev/null
 	if [ -x _testprog ]; then
@@ -629,12 +677,16 @@
 	fi
 	rm -f _testprog
 
-#	#  -intrinsics
-#	$CC $CFLAGS _testprog.c -o _testprog -intrinsics 2> /dev/null
-#	if [ -x _testprog ]; then
-#		CFLAGS="-intrinsics $CFLAGS"
-#	fi
-#	rm -f _testprog
+	#  -intrinsics
+	printf "checking whether -intrinsics can be used... "
+	$CC $CFLAGS _testprog.c -o _testprog -intrinsics 2> /dev/null
+	if [ -x _testprog ]; then
+		CFLAGS="-intrinsics $CFLAGS"
+		printf "yes\n"
+	else
+		printf "no\n"
+	fi
+	rm -f _testprog
 
 	#  -fast
 	printf "checking whether -fast can be used... "
@@ -646,49 +698,80 @@
 		printf "no\n"
 	fi
 	rm -f _testprog
-fi
+fi; fi
 
 
 #  -fpeephole
-printf "checking whether -fpeephole can be used... "
-$CC $CFLAGS -fpeephole _testprog.c -o _testprog > _testprog.stdout 2>&1
-cat _testprog.stdout >> _testprog.error
-if grep peephole _testprog.error > /dev/null 2>&1; then
-	printf "no\n"
-else
-	if [ -x _testprog ]; then
-		CFLAGS="-fpeephole $CFLAGS"
-		printf "yes\n"
-	else
+if [ ! z"$DEBUG" = zYES ]; then
+	printf "checking whether -fpeephole can be used... "
+	$CC $CFLAGS -fpeephole _testprog.c -o _testprog > _testprog.stdout 2>&1
+	cat _testprog.stdout >> _testprog.error
+	if grep peephole _testprog.error > /dev/null 2>&1; then
 		printf "no\n"
+	else
+		if [ -x _testprog ]; then
+			CFLAGS="-fpeephole $CFLAGS"
+			printf "yes\n"
+		else
+			printf "no\n"
+		fi
 	fi
+	rm -f _testprog _testprog.error _testprog.stdout
 fi
-rm -f _testprog _testprog.error _testprog.stdout
 
 
 #  -fomit-frame-pointer
-printf "checking whether -fomit-frame-pointer can be used... "
-$CC $CFLAGS -fomit-frame-pointer _testprog.c -o \
-    _testprog 1> _testprog.stdout 2>&1
-cat _testprog.stdout >> _testprog.error
-if grep frame _testprog.error > /dev/null 2>&1; then
-	printf "no\n"
-else
-	if [ -x _testprog ]; then
-		CFLAGS="-fomit-frame-pointer $CFLAGS"
-		printf "yes\n"
+if [ ! z"$DEBUG" = zYES ]; then
+	printf "checking whether -fomit-frame-pointer can be used... "
+	$CC $CFLAGS -fomit-frame-pointer _testprog.c -o \
+	    _testprog 1> _testprog.stdout 2>&1
+	cat _testprog.stdout >> _testprog.error
+	if grep frame _testprog.error > /dev/null 2>&1; then
+		printf "no\n"
 	else
+		if [ -x _testprog ]; then
+			CFLAGS="-fomit-frame-pointer $CFLAGS"
+			printf "yes\n"
+		else
+			printf "no\n"
+		fi
+	fi
+	rm -f _testprog _testprog.error _testprog.stdout
+fi
+
+
+#  -fstrict-aliasing
+if [ ! z"$DEBUG" = zYES ]; then
+	printf "checking whether -fstrict-aliasing can be used... "
+	$CC $CFLAGS -fstrict-aliasing _testprog.c -o \
+	    _testprog 1> _testprog.stdout 2>&1
+	cat _testprog.stdout >> _testprog.error
+	if grep frame _testprog.error > /dev/null 2>&1; then
 		printf "no\n"
+	else
+		if [ -x _testprog ]; then
+			CFLAGS="-fstrict-aliasing $CFLAGS"
+			printf "yes\n"
+		else
+			printf "no\n"
+		fi
 	fi
+	rm -f _testprog _testprog.error _testprog.stdout
 fi
-rm -f _testprog _testprog.error _testprog.stdout
 
 
 #  -g, for development builds
 if [ z"$UNSTABLE" = zYES ]; then
 	printf "checking whether -g can be used... "
 	if [ z"$COMPAQCC" = zYES ]; then
-		printf "skipping\n"
+		$CC $CFLAGS -g3 _testprog.c -o _testprog > _testprog.stdout 2>&1
+		cat _testprog.stdout >> _testprog.error
+		if [ -x _testprog ]; then
+			CFLAGS="-g3 $CFLAGS"
+			printf "yes (-g3)\n"
+		else
+			printf "no\n"
+		fi
 	else
 		$CC $CFLAGS -g _testprog.c -o _testprog > _testprog.stdout 2>&1
 		cat _testprog.stdout >> _testprog.error
@@ -696,8 +779,8 @@
 			CFLAGS="-g $CFLAGS"
 			printf "yes\n"
 		else
-		printf "no\n"
-			fi
+			printf "no\n"
+		fi
 	fi
 	rm -f _testprog _testprog.error _testprog.stdout
 fi
@@ -756,7 +839,7 @@
 #  -lm?
 printf "checking for math libs..."
 printf "#include <math.h>\nint main(int argc, char *argv[]) { " > _testr.c
-printf "double x = sqrt((double)argc); return (int)x; }\n" >> _testr.c
+printf "double x = sqrt(sin((double)argc)); return (int)x; }\n" >> _testr.c
 $CC $CFLAGS _testr.c -o _testr 2> /dev/null
 if [ ! -x _testr ]; then
 	$CC $CFLAGS _testr.c -lm -o _testr 2> /dev/null
@@ -935,7 +1018,7 @@
 			printf "#include <stdio.h>\n#include <inttypes.h>\nint main(int argc, char *argv[]){
 			    printf(\"%%lx\\\n\", (int64_t)128);return 0;}\n" > _testpri.c
 			rm -f _testpri
-			$CC $CFLAGS $CWARNINGS _testpri.c -o _testpri 2> /dev/null
+			$CC $CFLAGS $CWARNINGS _testpri.c -o _testpri 2> _testpri.result
 			if [ z`./_testpri` = z80 ]; then
 				printf "PRIx64=lx\n"
 			else
@@ -945,7 +1028,7 @@
 		fi
 	fi
 fi
-rm -f _testpri.c _testpri
+rm -f _testpri.c _testpri _testpri.result
 
 
 #  Check for 64-bit off_t:
@@ -1035,7 +1118,23 @@
 else
 	printf "yes\n"
 fi
-rm -f _testuint.c _testuint
+rm -f _testuint*
+
+printf "checking for __FUNCTION__... "
+printf "#include <stdio.h>\n\nint main(int argc, char *argv[]) {
+  if (__FUNCTION__) printf(__FUNCTION__);\n  return 0;\n}\n" > _testfunction.c
+$CC $CFLAGS _testfunction.c -o _testfunction 2> /dev/null
+if [ ! -x _testfunction ]; then
+	printf "no\n"
+else
+	if [ z`./_testfunction` = zmain ]; then
+		printf "yes\n"
+		printf "#define HAVE___FUNCTION__\n" >> config.h
+	else
+		printf "no\n"
+	fi
+fi
+rm -f _testfunction*
 
 
 ###############################################################################
@@ -1063,6 +1162,7 @@
 fi
 rm -f _test_end*
 
+
 ###############################################################################
 
 INCLUDE=-Iinclude/
@@ -1085,7 +1185,8 @@
 
 #  Create the Makefiles:
 D=". src src/include src/cpus src/debugger src/devices src/devices/fonts"
-D="$D src/machines src/promemul doc"
+D="$D src/disk src/file src/machines src/native src/net src/promemul"
+D="$D src/useremul"
 for a in $D; do
 	echo "creating $a/Makefile"
 	touch $a/Makefile
@@ -1100,3 +1201,4 @@
 rm -f _Makefile.header
 
 echo Configured. You may now run make to build gxemul.
+