--- gforth/configure.in	2008/01/23 20:42:25	1.214
+++ gforth/configure.in	2008/08/08 20:56:14	1.235
@@ -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,15 +20,25 @@ 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-20070604],[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="June 02, 2007"
+UPDATED="July 16, 2008"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
+#remnants from having ltdl as convenience library
+LTDLDEPS=""
+LTDLINCL=""
+LIBLTDL=""
+LTDL_LDLIBS=""
+AC_SUBST(LTDLDEPS)
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(LTDL_LDLIBS)
+
 #suppress the "-g -O2" default
 test "$CFLAGS" || CFLAGS=-O2
 
@@ -510,7 +520,7 @@ then
 	AC_DEFINE_UNQUOTED(DOUBLE_UCELL_TYPE,$ac_cv_int_type_double_ucell,[an unsigned integer type that is twice as long as a pointer])
         OPTS=-ll
 else
-        if test "$ac_cv_sizeof_char_p" == 8; then
+        if test "$ac_cv_sizeof_char_p" = 8; then
            OPTS="-ll -noll"
         else
            OPTS=-noll
@@ -518,7 +528,11 @@ else
 fi
 
 if grep -q FORCE_REG arch/$machine/machine.h; then
-   OPTS=`for i in $OPTS; do echo -n "$i-reg "; done`$OPTS
+   OPTS2=''
+   for i in $OPTS; do OPTS2="$OPTS2 $i-reg"; done
+   OPTS="$OPTS2 $OPTS"
+else
+  AC_DEFINE_UNQUOTED(FORCE_REG_UNNECESSARY,,[defined if the platform does not need FORCE_REG])
 fi
 AC_SUBST(OPTS)
 
@@ -607,13 +621,19 @@ AC_MSG_RESULT($M4)
 
 # Find installed Gforth
 AC_MSG_CHECKING([for gforth])
-GFORTH="`which gforth 2>/dev/null`"
-if test ! -z "$GFORTH"; then  GFORTH="$GFORTH -m4M --die-on-signal -i `gforth --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ; fi
-AC_SUBST(GFORTH)
-AC_DEFINE_UNQUOTED(GFORTH,"$GFORTH",[How to invoke gforth])
-AC_MSG_RESULT($GFORTH)
+GFORTH="`cd / && which gforth 2>/dev/null`"
+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: //'`" ;
+  kernel_anti_dependence='$(kernel_fi)'
+fi
+AC_SUBST(PREFORTH)
+AC_SUBST(kernel_anti_dependence)
+AC_MSG_RESULT($PREFORTH)
 
-echo "machine='$machine'"
+#echo "machine='$machine'"
 
 dnl AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine)
 AC_CHECK_FILE($srcdir/arch/$machine/asm.fs,[asm_fs=arch/$machine/asm.fs],)
@@ -788,31 +808,30 @@ 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)
-AC_CHECK_LIB(dl,dlopen)
-dnl check for libffi 2.x
+#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])
+  LIBFFIFLAG="true"
 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"
+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)
 if test "$host_os" != "nextstep3"
 then
 	AC_FUNC_MEMCMP
@@ -851,6 +870,7 @@ gforthmi
 vmgen
 machpc.fs
 envos.fs
+preforth
 engine/Makefile
 engine/libcc.h
 doc/version.texi
@@ -859,6 +879,7 @@ AC_CONFIG_COMMANDS([stamp-h],[[echo time
 chmod +x gforthmi
 chmod +x vmgen
 chmod +x build-ec
+chmod +x preforth
 test -d kernel||mkdir kernel
 $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION
 ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],[[PACKAGE_VERSION=$PACKAGE_VERSION]])