--- gforth/configure.in	2008/07/13 23:44:25	1.228
+++ gforth/configure.in	2008/08/16 16:58:35	1.240
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -20,12 +20,12 @@ dnl Process this file with autoconf to p
 
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AC_INIT([gforth],[0.6.9-20080430],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.6.9-20080716],[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 23, 2008"
+UPDATED="July 16, 2008"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
@@ -108,6 +108,7 @@ AC_ARG_VAR(FORTHSIZES, [Gforth command l
 AC_ARG_VAR(STACK_CACHE_REGS, [number of registers in the maximum stack cache state for gforth-fast and gforth-native (default platform-dependent).])
 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(LIBCC_BUILD_SRC, [(Additional) libcc interface source files that should be processed on building and installation (default none)])
 
 AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)])
 AC_ARG_VAR(ac_cv_sizeof_void_p, [sizeof(void *)])
@@ -149,7 +150,7 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor
 
 AC_MSG_CHECKING([whether to use two dispatches per conditional branch])
 test x$condbranch_opt = x && 
-if ($CC -v 2>&1 |grep -q 'gcc version 3'); then
+if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then
    condbranch_opt=0
 else
    condbranch_opt=1
@@ -302,7 +303,7 @@ case "$host_cpu" in
 		AC_CHECK_FUNC(_sync_cache_range,[true],[AC_LIBOBJ(../arch/power/_sync_cache_range)])
 		#long long is broken on (at least) gcc-2.95.* for PPC
 		test x$ac_cv_sizeof_long_long = x && 
-		($CC -v 2>&1 |grep -q 'gcc version 2.95') &&
+		($CC -v 2>&1 |grep 'gcc version 2.95' >/dev/null) &&
 		ac_cv_sizeof_long_long=0
                 #The only architecture with enough callee-saved registers
                 test x$STACK_CACHE_REGS = x && STACK_CACHE_REGS=3
@@ -527,7 +528,7 @@ else
         fi
 fi
 
-if grep -q FORCE_REG arch/$machine/machine.h; then
+if grep FORCE_REG arch/$machine/machine.h >/dev/null; then
    OPTS2=''
    for i in $OPTS; do OPTS2="$OPTS2 $i-reg"; done
    OPTS="$OPTS2 $OPTS"
@@ -622,13 +623,16 @@ AC_MSG_RESULT($M4)
 # Find installed Gforth
 AC_MSG_CHECKING([for gforth])
 GFORTH="`cd / && which gforth 2>/dev/null`"
+(cd / && $GFORTH -e bye >/dev/null 2>/dev/null) || GFORTH=""
 if test -z "$GFORTH"; then
   PREFORTH='echo "You need to configure with a gforth in \$PATH to build this part" && false'
+  kernel_anti_dependence=''
 else
-  PREFORTH="$GFORTH -i `cd / && gforth --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ;
+  PREFORTH="$GFORTH -i `cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ;
+  kernel_anti_dependence='$(kernel_fi)'
 fi
 AC_SUBST(PREFORTH)
-AC_DEFINE_UNQUOTED(PREFORTH,"$PREFORTH",[How to invoke the pre-installed gforth])
+AC_SUBST(kernel_anti_dependence)
 AC_MSG_RESULT($PREFORTH)
 
 #echo "machine='$machine'"
@@ -806,30 +810,38 @@ 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(ltdl,lt_dlinit)
-dnl check for libffi 2.x
+#check for libffi 2.x
+AC_CHECK_HEADER(ffi.h,FFI_H_NAME=ffi.h,)
+if test -z "$FFI_H_NAME"; then
+  AC_CHECK_HEADER(ffi/ffi.h,FFI_H_NAME=ffi/ffi.h,)
+fi
+AC_SUBST(FFI_H_NAME)
 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])
+  LIBFFIFLAG="true"
+  LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC libffi.fs"
 else
-dnl check for ffcall libraries
-dnl unfortunately, these four calls are separated out into a library each.
+  LIBFFIFLAG="false"
+fi
+#check for ffcall libraries
+#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])
+dnl AC_CHECK_LIB(callback,__vacall_r)
+dnl AC_CHECK_LIB(vacall,vacall)
+dnl AC_CHECK_LIB(trampoline,alloc_trampoline)
+if test $ac_cv_lib_avcall___builtin_avcall = yes; then
+  FFCALLFLAG="true"
+  LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC fflib.fs"
+else
+  FFCALLFLAG="false"
+fi
+if test $LIBFFIFLAG = false -a $FFCALLFLAG = false; then
+  AC_MSG_WARN([The (old) lib.fs foreign function interface needs either libffi or the ffcall libraries])
 fi
 AC_SUBST(LIBFFIFLAG)
 AC_SUBST(FFCALLFLAG)
-AC_SUBST(OLDCALLFLAG)
+AC_SUBST(LIBCC_BUILD_SRC)
 if test "$host_os" != "nextstep3"
 then
 	AC_FUNC_MEMCMP
@@ -871,7 +883,6 @@ envos.fs
 preforth
 engine/Makefile
 engine/libcc.h
-libcc.fs
 doc/version.texi
 build-ec ])
 AC_CONFIG_COMMANDS([stamp-h],[[echo timestamp > stamp-h