--- gforth/configure.in	2003/03/02 21:25:20	1.116
+++ gforth/configure.in	2003/07/18 15:12:26	1.122
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -18,17 +18,21 @@ dnl Process this file with autoconf to p
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
+
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AC_INIT([gforth],[0.5.9-20030201],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.6.1],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
 AC_PREREQ(2.54)
 #snapshots have numbers major.minor.release-YYYYMMDD
 #note that lexicographic ordering must be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
-UPDATED="February 1st, 2003"
+UPDATED="March 11, 2003"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
+#suppress the "-g -O2" default
+test "$CFLAGS" || CFLAGS=-O2
+
 #default setting that may be changed later:
 no_dynamic_default=0
 
@@ -40,12 +44,18 @@ AC_ARG_ENABLE(force-reg,
 AC_DEFINE(FORCE_REG,,[Define if you want to use explicit register declarations for better performance or for more convenient CODE words (does not work with all GCC versions on all machines)]))
 
 AC_ARG_WITH(debug,
-[  --with-debug     specifies option -g to compile with debug info (default)
-  --without-debug  omits the -g switch and creates smaller images on
-                   machines where "strip" has problems with gcc style
-                   debugging informations.],
+[  --with-debug		  specifies option -g to compile with debug info
+  --without-debug	  omits the -g switch and creates smaller images on
+			  machines where "strip" has problems with gcc style
+			  debugging informations.],
 if test "$withval" = "yes"; then DEBUGFLAG=-g; fi)
 
+AC_ARG_WITH(dynamic,
+[  --with-dynamic	  Gforth defaults to dynamic super instructions,
+  --without-dynamic	  this may cause problems with newer GCCs and global
+			  CSE, so if you see troubles, turn it off.],
+if test "$withval" = "no"; then no_dynamic_default=1; fi)
+
 dnl PEEPHOLE="yes"
 dnl AC_ARG_WITH(peephole,
 dnl [  --with-peephole	Enable peephole optimization (default)
@@ -85,8 +95,6 @@ dnl AC_DEFINE_UNQUOTED([_FILE_OFFSET_BIT
 #currently we force direct threading this way.  Eventually we should
 #setup in the arch and engine files right
 
-CFLAGS=$CFLAGS
-
 AC_PROG_CC
 
 test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher)
@@ -295,7 +303,6 @@ CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_nogcse)
 
 # Try if GCC understands -fno-strict-aliasing
-
 AC_MSG_CHECKING([if $CC understands -fno-strict-aliasing])
 CFLAGS_1="$CFLAGS"
 CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -304,7 +311,6 @@ CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_nostrictaliasing)
 
 # Try if GCC understands -fno-cross-jump
-
 AC_MSG_CHECKING([if $CC understands -fno-cross-jump])
 CFLAGS_1="$CFLAGS"
 CFLAGS="$CFLAGS -fno-cross-jump"
@@ -327,7 +333,7 @@ case "$host_os" in
 	*darwin*)
 		#Darwin uses some funny preprocessor by default; eliminate it:
 		AC_MSG_NOTICE([using -traditional-cpp on Darwin])
-		CFLAGS="$CFLAGS -traditional-cpp"
+		CFLAGS="$CFLAGS -no-cpp-precomp"
 		DIRSEP="/"
 		;;
 	*)