--- trunk/configure	2007/10/08 16:22:43	43
+++ trunk/configure	2007/10/08 16:22:56	44
@@ -27,7 +27,7 @@
 #  SUCH DAMAGE.
 #
 #
-#  $Id: configure,v 1.270 2007/06/15 17:13:40 debug Exp $
+#  $Id: configure,v 1.277 2007/08/29 20:36:05 debug Exp $
 #
 #  This is a minimal configure script, hardcoded for GXemul. This script
 #  figures out which compiler flags will work, and creates Makefiles in
@@ -112,7 +112,7 @@
 #  Figure out if VERSION should be defined.
 X=`basename \`pwd\`|cut -d \- -f 2-`
 if [ z"$X" = zgxemul ]; then
-	echo '/*  No VERSION defined.  */' >> config.h
+	printf "#define VERSION \"(unknown version)\"\n" >> config.h
 else
 	printf "#define VERSION \"$X\"\n" >> config.h
 fi
@@ -161,6 +161,10 @@
 CPU_TOOLS="$CPU_TOOLS generate_arm_dpi generate_arm_r"
 CPU_TOOLS="$CPU_TOOLS generate_arm_loadstore generate_arm_multi"
 
+#  M32R
+printf " add_cpu_family(m32r_cpu_family_init, ARCH_M32R);" >> config.h
+CPU_ARCHS="$CPU_ARCHS cpu_m32r.o memory_m32r.o"
+
 #  M88K
 printf " add_cpu_family(m88k_cpu_family_init, ARCH_M88K);" >> config.h
 CPU_ARCHS="$CPU_ARCHS cpu_m88k.o memory_m88k.o"
@@ -374,6 +378,20 @@
 
 	rm -f _test_x11 _test_x11.o
 
+	if [ z$XOK = z0 ]; then
+		XINCLUDE=-I/usr/local/include
+		$CC $CFLAGS _test_x11.c -c -o _test_x11.o \
+		    $XINCLUDE 2> /dev/null
+
+		XLIB="-L/usr/local/lib -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
+
 	#  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 \
@@ -1184,9 +1202,9 @@
 
 
 #  Create the Makefiles:
-D=". src src/include src/cpus src/debugger src/devices src/devices/fonts"
-D="$D src/disk src/file src/machines src/native src/net src/promemul"
-D="$D src/useremul"
+D=". src src/include src/console src/cpus src/debugger src/devices"
+D="$D src/devices/fonts src/disk src/file src/machines"
+D="$D src/net src/promemul src/symbol src/useremul"
 for a in $D; do
 	echo "creating $a/Makefile"
 	touch $a/Makefile