--- gforth/configure.in	2003/07/18 15:12:26	1.122
+++ gforth/configure.in	2003/08/06 08:43:47	1.125
@@ -34,7 +34,7 @@ AC_CONFIG_HEADERS(engine/config.h)
 test "$CFLAGS" || CFLAGS=-O2
 
 #default setting that may be changed later:
-no_dynamic_default=0
+test "$no_dynamic_default" || no_dynamic_default=0
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -50,12 +50,6 @@ AC_ARG_WITH(debug,
 			  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)
@@ -64,7 +58,7 @@ dnl 			but slower images.],
 dnl PEEPHOLE="$withval")
 
 #variables mentioned in INSTALL
-AC_ARG_VAR(CC, [The C compiler (must support GNU C 2.x).])
+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(ac_cv_sizeof_char_p, [sizeof(char *)])
 AC_ARG_VAR(ac_cv_sizeof_char, [sizeof(char)])
@@ -74,7 +68,8 @@ AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(lo
 AC_ARG_VAR(ac_cv_sizeof_long_long, [sizeof(long long)])
 AC_ARG_VAR(ac_cv_sizeof_intptr_t, [sizeof(intptr_t)])
 AC_ARG_VAR(ac_cv_sizeof_int128_t, [sizeof(int128_t)])
-AC_ARG_VAR(ac_cv_c_bigendian, [Is the target big-endian ("yes" or "no)?])
+AC_ARG_VAR(ac_cv_c_bigendian, [Is the target big-endian ("yes" or "no")?])
+AC_ARG_VAR(no_dynamic_default, [run gforth with --dynamic (0) or --no-dynamic (1) by default])
 
 #set up feature test macros, so the tests get them right:
 # turn on all POSIX, SUSv3, and GNU features if available
@@ -310,13 +305,13 @@ AC_TRY_COMPILE(,,ac_nostrictaliasing=yes
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_nostrictaliasing)
 
-# Try if GCC understands -fno-cross-jump
-AC_MSG_CHECKING([if $CC understands -fno-cross-jump])
+# Try if GCC understands -fno-crossjumping
+AC_MSG_CHECKING([if $CC understands -fno-crossjumping])
 CFLAGS_1="$CFLAGS"
-CFLAGS="$CFLAGS -fno-cross-jump"
-AC_TRY_COMPILE(,,ac_nocrossjump=yes;ENGINE_FLAGS="$ENGINE_FLAGS -fno-cross-jump",ac_nocrossjump=no)
+CFLAGS="$CFLAGS -fno-crossjumping"
+AC_TRY_COMPILE(,,ac_nocrossjumping=yes;ENGINE_FLAGS="$ENGINE_FLAGS -fno-crossjumping",ac_nocrossjumping=no)
 CFLAGS="$CFLAGS_1"
-AC_MSG_RESULT($ac_nocrossjump)
+AC_MSG_RESULT($ac_nocrossjumping)
 
 AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine)
 AC_SUBST(asm_fs)
@@ -436,6 +431,15 @@ 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 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)
+FFCALLFLAG="false"
+test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true"
+AC_SUBST(FFCALLFLAG)
 if test "$host_os" != "nextstep3"
 then
 	AC_FUNC_MEMCMP