--- gforth/configure.in	2008/01/16 21:50:55	1.209
+++ gforth/configure.in	2008/05/04 18:09:30	1.226
@@ -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-20080430],[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="February 23, 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
 
@@ -188,11 +198,19 @@ case "$host_cpu" in
 		   CFLAGS="$CFLAGS -mthumb -mthumb-interwork"
 		fi
 		if test -z $arm_cacheflush; then
-		    no_dynamic_default=1
-                    arm_cacheflush=arch/arm/cacheflush0
-		    AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation])
+		   case "$host_os" in
+		     *linux*)
+			arm_cacheflush=arch/arm/cacheflush-linux 
+			;;
+		     *)   
+			no_dynamic_default=1
+			arm_cacheflush=arch/arm/cacheflush0
+			AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation])
+			;;
+                   esac
 		fi
-                AC_LIBSOURCES([../arch/arm/cacheflush0, ../arch/arm/cacheflush1, ../arch/arm/cacheflush2])
+                AC_LIBSOURCES([../arch/arm/cacheflush0, dnl
+			       ../arch/arm/cacheflush-linux])
                 AC_LIBOBJ(../$arm_cacheflush)
                 #longer skipcodes lead to problems on ARM, and it uses
                 #only 4-byte alignment anyway
@@ -502,8 +520,8 @@ 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
-           OPTS="-ll -no-ll"
+        if test "$ac_cv_sizeof_char_p" = 8; then
+           OPTS="-ll -noll"
         else
            OPTS=-noll
         fi
@@ -511,6 +529,8 @@ fi
 
 if grep -q FORCE_REG arch/$machine/machine.h; then
    OPTS=`for i in $OPTS; do echo -n "$i-reg "; done`$OPTS
+else
+  AC_DEFINE_UNQUOTED(FORCE_REG_UNNECESSARY,,[defined if the platform does not need FORCE_REG])
 fi
 AC_SUBST(OPTS)
 
@@ -599,13 +619,17 @@ 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" ; 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'
+else
+  PREFORTH="$GFORTH -i `cd / && gforth --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ;
+fi
+AC_SUBST(PREFORTH)
+AC_DEFINE_UNQUOTED(PREFORTH,"$PREFORTH",[How to invoke the pre-installed gforth])
+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],)
@@ -780,7 +804,6 @@ 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
 AC_CHECK_LIB(ffi,ffi_call)
 if test $ac_cv_lib_ffi_ffi_call = yes
@@ -843,6 +866,7 @@ gforthmi
 vmgen
 machpc.fs
 envos.fs
+preforth
 engine/Makefile
 engine/libcc.h
 doc/version.texi
@@ -851,6 +875,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]])