--- gforth/configure.in	2000/09/26 07:13:41	1.76
+++ gforth/configure.in	2002/03/13 16:59:12	1.82
@@ -22,7 +22,7 @@ AC_INIT(engine/engine.c)
 
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AM_INIT_AUTOMAKE(gforth,0.5.0)
+AM_INIT_AUTOMAKE(gforth,0.5.9-20010501)
 #snapshots have numbers major.minor.release-YYYYMMDD
 #note that lexicographic ordering bust be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
@@ -34,19 +34,7 @@ AC_ARG_ENABLE(force-reg,
 			  the machine.h file. This can cause a good speedup,
 			  but also incorrect code with some gcc versions on
 			  some processors (default disabled).],
-
 AC_DEFINE(FORCE_REG))
-dnl this is not quite according to the autoconf manual, it causes a replacement
-AC_ARG_ENABLE(direct-threaded,
-[  --enable-direct-threaded	Force direct threading. This may not work on
-				some machines and may cause slowdown on others.
-				(default processor-dependent)],
-AC_DEFINE(DIRECT_THREADED))
-AC_ARG_ENABLE(indirect-threaded,
-[  --enable-indirect-threaded	Force indirect threading. This can cause a
-				slowdown on some machines.
-				(default processor-dependent)],
-AC_DEFINE(INDIRECT_THREADED))
 
 AC_ARG_WITH(debug,
 [  --with-debug     specifies option -g to compile with debug info (default)
@@ -55,6 +43,17 @@ AC_ARG_WITH(debug,
                    debugging informations.],
 if test "$withval" = "yes"; then DEBUGFLAG=-g; fi)
 
+PEEPHOLE="yes"
+AC_ARG_WITH(peephole,
+[  --with-peephole	Enable peephole optimization (default)
+  --without-peephole	disables peephole optimization. Creates smaller,
+			but slower images.],
+PEEPHOLE="$withval")
+
+#currently we force direct threading this way.  Eventually we should
+#setup in the arch and engine files right
+AC_DEFINE(DIRECT_THREADED)
+
 CFLAGS=$CFLAGS
 
 AC_PROG_CC
@@ -192,7 +191,7 @@ case "$host_cpu" in
 			AC_DEFINE(DIRECT_THREADED)
 		fi
 		;;
-	i586)
+	i*86)
 		machine=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
 		CFLAGS_1="$CFLAGS"
@@ -201,23 +200,10 @@ case "$host_cpu" in
 		if test "${enable_direct_threaded+set}" = "" \
 			-a "${enable_indirect_threaded+set}" = ""
 		then
-			echo "Using indirect threaded code on Pentium/K5/K6"
+			echo "Using indirect threaded code on IA32 CPUs with split L1 caches"
 			AC_DEFINE(INDIRECT_THREADED)
 		fi
 		;;
-	i686)
-		machine=386
-		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
-		CFLAGS_1="$CFLAGS"
-		CFLAGS="$CFLAGS -mpentium"
-		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
-		if test "${enable_direct_threaded+set}" = "" \
-			-a "${enable_indirect_threaded+set}" = ""
-		then
-			echo "Using direct threaded code on Athlon/PPro/Pentium II/Pentium III"
-			AC_DEFINE(DIRECT_THREADED)
-		fi
-		;;
 	ia64*)
 		machine=ia64
 		;;
@@ -309,6 +295,15 @@ AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP')
 
 AC_SUBST(FORTHSIZES)
 
+if test "$PEEPHOLE" = "yes"
+then
+   PEEPHOLEFLAG="true"
+   AC_DEFINE(HAS_PEEPHOLE)
+else
+   PEEPHOLEFLAG="false"
+fi
+AC_SUBST(PEEPHOLEFLAG)
+
 dnl copy commands for systems that don't have links
 AC_SUBST(LINK_KERNL)
 LINK_KERNL=""
@@ -373,9 +368,12 @@ AC_OUTPUT([
 Makefile
 Makedist
 gforthmi
+vmgen
+machpc.fs
 engine/Makefile
 doc/version.texi ],
 echo timestamp > stamp-h
 chmod +x gforthmi
+chmod +x vmgen
 test -d kernel||mkdir kernel)