--- gforth/configure.in	2007/02/17 16:23:06	1.172
+++ gforth/configure.in	2007/02/26 19:07:05	1.173
@@ -53,17 +53,6 @@ AC_ARG_ENABLE(force-ll,
 test "$enable_force_ll" = "no"||
   AC_DEFINE(FORCE_LL,,[Define if you want to use explicit long long declarations for better performance (does not work with all GCC versions on all machines)])
 
-AC_ARG_ENABLE(gcc-pr15242-workaround,
-              AC_HELP_STRING([--disable-gcc-pr15242-workaround],[Disables
-                             dynamic code generation on some versions of gcc
-                             (slowdown~2 on Athlon) and causes slower building
-                             of gforth (but gforth speedups) on others.
-                             (default enabled)]),
-		,enable_gcc_pr15242_workaround=yes)
-test "$enable_gcc_pr15242_workaround" = "no"||
-AC_DEFINE(GCC_PR15242_WORKAROUND,,[Define if you want to get dynamic code
-generation on gccs affected by PR15242])
-
 AC_ARG_ENABLE(force-cdiv,
 	AC_HELP_STRING([--enable-force-cdiv],
 		       [  Use the native C division - symmetric - instead of
@@ -114,6 +103,8 @@ fi
 AC_ARG_VAR(CC, [The C compiler (must support GNU C 2.x); gcc-2.95 recommended.])
 AC_ARG_VAR(FORTHSIZES, [Gforth command line options for the default stack and dictionary sizes (see INSTALL).])
 AC_ARG_VAR(STACK_CACHE_DEFAULT_FAST, [number of registers in the default stack cache state for gforth-fast and gforth-native (default 1).])
+AC_ARG_VAR(GCC_PR15242_WORKAROUND, [Force the enabling (1) or disabling (0) of a workaround for a gcc-3.x performance bug (default unset: use workaround for gcc-3.x)])
+
 AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)])
 AC_ARG_VAR(ac_cv_sizeof_char, [sizeof(char)])
 AC_ARG_VAR(ac_cv_sizeof_short, [sizeof(short)])
@@ -280,6 +271,14 @@ test x$STACK_CACHE_DEFAULT_FAST = x && S
 AC_DEFINE_UNQUOTED(STACK_CACHE_DEFAULT_FAST, $STACK_CACHE_DEFAULT_FAST,
 		   [number of registers in the default stack cache state for gforth-fast and gforth-native])
 
+test x$GCC_PR15242_WORKAROUND = x ||
+AC_DEFINE_UNQUOTED(GCC_PR15242_WORKAROUND, $GCC_PR15242_WORKAROUND,
+                   [force (1) or forbid (0) use of a workaround for a gcc performance bug])
+
+dnl AC_DEFINE(GCC_PR15242_WORKAROUND,,[Define if you want to get dynamic code
+dnl generation on gccs affected by PR15242])
+
+
 if test "${enable_force_ll+set}" = set; then
    ac_includes_default="$ac_includes_default
 #include \"arch/generic/128bit.h\""