--- gforth/configure.in	2005/01/23 21:35:47	1.148
+++ gforth/configure.in	2005/08/21 22:09:13	1.152
@@ -34,19 +34,24 @@ AC_CONFIG_HEADERS(engine/config.h)
 test "$CFLAGS" || CFLAGS=-O2
 
 AC_ARG_ENABLE(force-reg,
-[  --enable-force-reg	  Use explicit register declarations if they appear in
+	AC_HELP_STRING([--enable-force-reg],
+		        [ Use explicit register declarations if they appear in
 			  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,,[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)]))
+			  some processors (default disabled).]),
+	,enable_force_reg=no)
+test "$enable_force_reg" = "no"||
+  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_ENABLE(force-ll,
-[  --enable-force-ll	  Use explicit long long declarations if they appear in
+	AC_HELP_STRING([--enable-force-ll],
+		       [  Use explicit long long declarations if they appear in
 			  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_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_SUBST(PROFEXES)
-AC_SUBST(PROFOBJS)
+			  some processors (default disabled).]),
+	,enable_force_ll=no)
+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
@@ -59,10 +64,24 @@ test "$enable_gcc_pr15242_workaround" =
 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
+		          floored division (default disabled).]),
+	,enable_force_cdiv=no)
+test "$enable_force_cdiv" = "no"||
+  AC_DEFINE(FORCE_CDIV,,[Define if you want to use explicit symmetric division for better performance])
+
+AC_SUBST(PROFEXES)
+AC_SUBST(PROFOBJS)
 AC_ARG_ENABLE(prof,
-[  --enable-prof          Build gforth-prof, which outputs frequently occuring
-                          sequences of primitives.],
-PROFEXES="gforth-prof\$(EXE)"; PROFOBJS="engine-prof.o main-prof.o profile.o")
+	AC_HELP_STRING([--enable-prof],
+			[ Build gforth-prof, which outputs frequently occuring
+                          sequences of primitives.]),
+	,enable_prof=no)
+if test "$enable_prof" = "no"; then
+  PROFEXES="gforth-prof\$(EXE)"; PROFOBJS="engine-prof.o main-prof.o profile.o"
+fi
 
 AC_ARG_WITH(debug,
 [  --with-debug		  specifies option -g to compile with debug info
@@ -81,6 +100,7 @@ dnl PEEPHOLE="$withval")
 #variables mentioned in INSTALL
 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(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)])
@@ -240,6 +260,10 @@ case "$host_cpu" in
 esac
 AC_SUBST(host)
 
+test x$STACK_CACHE_DEFAULT_FAST = x && STACK_CACHE_DEFAULT_FAST=1
+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])
+
 if test "${enable_force_ll+set}" = set; then
    ac_includes_default="$ac_includes_default
 #include \"arch/generic/128bit.h\""
@@ -547,16 +571,28 @@ dnl This check is just for making later
 dnl using sin here is no good idea since it is built-into gcc and typechecked
 AC_CHECK_LIB(m,asin)
 AC_CHECK_LIB(dl,dlopen)
+dnl check for libffi 2.x
+AC_CHECK_LIB(ffi,ffi_call)
+if test $ac_cv_lib_ffi_ffi_call = yes
+then
+LIBFFIFLAG="true"
+FFCALLFLAG="false"
+OLDCALLFLAG="false"
+AC_DEFINE(HAS_LIBFFI,,[define this if you want to use the ffcall interface with libffi 2.0])
+else
 dnl check for ffcall libraries
 dnl unfortunately, these four calls are separated out into a library each.
 AC_CHECK_LIB(avcall,__builtin_avcall)
 AC_CHECK_LIB(callback,__vacall_r)
 AC_CHECK_LIB(vacall,vacall)
 AC_CHECK_LIB(trampoline,alloc_trampoline)
+LIBFFIFLAG="false"
 FFCALLFLAG="false"
 OLDCALLFLAG="true"
 test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && OLDCALLFLAG="false" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries])
 test $ac_cv_lib_avcall___builtin_avcall = no && AC_DEFINE(HAS_OLDCALL,,[define this if you want to use the old call libraries])
+fi
+AC_SUBST(LIBFFIFLAG)
 AC_SUBST(FFCALLFLAG)
 AC_SUBST(OLDCALLFLAG)
 if test "$host_os" != "nextstep3"