--- trunk/configure	2007/10/08 16:17:48	2
+++ trunk/configure	2007/10/08 16:18:00	4
@@ -27,7 +27,7 @@
 #  SUCH DAMAGE.
 #
 #
-#  $Id: configure,v 1.119 2005/03/14 12:13:49 debug Exp $
+#  $Id: configure,v 1.123 2005/04/17 01:42:21 debug Exp $
 #
 #  This is a minimal configure script, hardcoded for GXemul. This script
 #  figures out which compiler flags will work, and creates Makefiles in
@@ -54,12 +54,13 @@
 #
 ###############################################################################
 
-ENABLEALPHA=YES
-ENABLEHPPA=YES
+ENABLEALPHA=NO
+ENABLEHPPA=NO
 ENABLEMIPS=YES
 ENABLEPPC=YES
-ENABLESPARC=YES
+ENABLESPARC=NO
 ENABLEURISC=YES
+ENABLEX86=NO
 
 if [ z"$*" != z ]; then
 	#  Parse command line options:
@@ -72,18 +73,20 @@
 			NOBINTRANS=YES
 		else if [ z$a = z--enable-mips16 ]; then
 			MIPS16=YES
-		else if [ z$a = z--disable-alpha ]; then
-			ENABLEALPHA=NO
-		else if [ z$a = z--disable-hppa ]; then
-			ENABLEHPPA=NO
+		else if [ z$a = z--enable-alpha ]; then
+			ENABLEALPHA=YES
+		else if [ z$a = z--enable-hppa ]; then
+			ENABLEHPPA=YES
 		else if [ z$a = z--disable-mips ]; then
 			ENABLEMIPS=NO
 		else if [ z$a = z--disable-ppc ]; then
 			ENABLEPPC=NO
-		else if [ z$a = z--disable-sparc ]; then
-			ENABLESPARC=NO
+		else if [ z$a = z--enable-sparc ]; then
+			ENABLESPARC=YES
 		else if [ z$a = z--disable-urisc ]; then
 			ENABLEURISC=NO
+		else if [ z$a = z--enable-x86 ]; then
+			ENABLEX86=YES
 		else if [ z$a = z--enable-delays ]; then
 			DELAYS=YES
 		else if [ z$a = z--enable-caches ]; then
@@ -102,13 +105,15 @@
 			echo "  --enable-delays     enable instruction" \
 			    "latency/delay emulation"
 			echo "  --disable-x         don't include X11 support"
-			printf "\nCPU selection options:\n"
-			echo "  --disable-alpha     disable Alpha CPU emulation"
-			echo "  --disable-hppa      disable HPPA CPU emulation"
+			printf "\nCPU selection options: (most of these"
+			printf " are experimental)\n"
+			echo "  --enable-alpha      enable Alpha CPU emulation"
+			echo "  --enable-hppa       enable HPPA CPU emulation"
 			echo "  --disable-mips      disable MIPS CPU emulation"
 			echo "  --disable-ppc       disable PPC CPU emulation"
-			echo "  --disable-sparc     disable SPARC CPU emulation"
+			echo "  --enable-sparc      enable SPARC CPU emulation"
 			echo "  --disable-urisc     disable URISC CPU emulation"
+			echo "  --enable-x86        enable x86 CPU emulation"
 			printf "\nMIPS-specific options:\n"
 			echo "  --enable-mips16     enable MIPS16 instruction" \
 			    "support (experimental)"
@@ -119,7 +124,7 @@
 			echo "Run  $0 --help  to get a list of" \
 			    "available options."
 			exit
-		fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
+		fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
 	done
 fi
 
@@ -162,33 +167,24 @@
 fi
 if [ z$ENABLEALPHA = zYES ]; then
 	printf "#define ENABLE_ALPHA\n" >> config.h
-else
-	echo 'Disabling Alpha emulation support.'
 fi
 if [ z$ENABLEHPPA = zYES ]; then
 	printf "#define ENABLE_HPPA\n" >> config.h
-else
-	echo 'Disabling HPPA emulation support.'
 fi
 if [ z$ENABLEMIPS = zYES ]; then
 	printf "#define ENABLE_MIPS\n" >> config.h
-else
-	echo 'Disabling MIPS emulation support.'
 fi
 if [ z$ENABLEPPC = zYES ]; then
 	printf "#define ENABLE_PPC\n" >> config.h
-else
-	echo 'Disabling PPC emulation support.'
 fi
 if [ z$ENABLESPARC = zYES ]; then
 	printf "#define ENABLE_SPARC\n" >> config.h
-else
-	echo 'Disabling SPARC emulation support.'
 fi
 if [ z$ENABLEURISC = zYES ]; then
 	printf "#define ENABLE_URISC\n" >> config.h
-else
-	echo 'Disabling URISC emulation support.'
+fi
+if [ z$ENABLEX86 = zYES ]; then
+	printf "#define ENABLE_X86\n" >> config.h
 fi
 
 
@@ -1039,13 +1035,15 @@
 
 ###############################################################################
 
-INCLUDE=-I../include/
+INCLUDE=-Iinclude/
+DINCLUDE=-I../include/
 
-echo C compiler flags: $CFLAGS $CWARNINGS $INCLUDE
+echo C compiler flags: $CFLAGS $CWARNINGS
 echo Linker flags: $OTHERLIBS
 echo "CWARNINGS=$CWARNINGS" >> _Makefile.header
 echo "COPTIM=$CFLAGS" >> _Makefile.header
 echo "INCLUDE=$INCLUDE" >> _Makefile.header
+echo "DINCLUDE=$DINCLUDE" >> _Makefile.header
 echo "CC=$CC" >> _Makefile.header
 echo "OTHERLIBS=$OTHERLIBS" >> _Makefile.header
 echo "" >> _Makefile.header
@@ -1206,7 +1204,7 @@
 
 #  Create the Makefiles:
 
-for a in . src devices devices/fonts tests; do
+for a in . src src/devices src/devices/fonts tests; do
 	echo "creating $a/Makefile"
 	touch $a/Makefile
 	cat _Makefile.header > $a/Makefile