--- gforth/configure.in	2011/11/14 22:33:22	1.290
+++ gforth/configure.in	2011/11/17 18:45:52	1.293
@@ -71,6 +71,7 @@ if test "$withval" = "yes"; then DEBUGFL
 GCC_LD="\$(GCC)"
 EC_MODE="false"
 NO_EC=""
+NO_CROSS=""
 EC=""
 engine2='engine2$(OPT).o'
 engine_fast2='engine-fast2$(OPT).o'
@@ -90,6 +91,7 @@ else
   EC_MODE="true"
   EC="-ec"
   NO_EC="#"
+  NO_CROSS="#"
   engine2=""
   engine_fast2=""
   no_dynamic="-DNO_DYNAMIC"
@@ -120,8 +122,9 @@ else
   fi
   GCC_PATH=$(which $CC)
   LIB_PATH=${GCC_PATH%/*/*}
-  GCC_LD="\$(LD)"
   platform=${withval}
+  NO_EC=""
+  NO_CROSS="#"
 fi])
 
 #variables mentioned in INSTALL
@@ -188,6 +191,7 @@ AC_SUBST(GCC_LD)
 AC_SUBST(DEBUGFLAG)
 AC_SUBST(EC)
 AC_SUBST(NO_EC)
+AC_SUBST(NO_CROSS)
 AC_SUBST(EC_MODE)
 AC_SUBST(engine2)
 AC_SUBST(engine_fast2)
@@ -701,22 +705,6 @@ fi
 AC_SUBST(M4)
 AC_MSG_RESULT($M4)
 
-# Find installed Gforth
-AC_MSG_CHECKING([for gforth])
-GFORTH="`cd / && which gforth 2>/dev/null`"
-#the "$srcdir" = "." test defends agains the "../" bug in gforth-0.6.2
-(cd / && $GFORTH -e bye >/dev/null 2>/dev/null  && test "$srcdir" = ".") || 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: //'`" ;
-  kernel_anti_dependence='$(kernel_fi)'
-fi
-AC_SUBST(PREFORTH)
-AC_SUBST(kernel_anti_dependence)
-AC_MSG_RESULT($PREFORTH)
-
 #echo "machine='$machine'"
 
 dnl AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine)
@@ -995,6 +983,27 @@ include_fi=kernl${wordsize}${bytesex}${E
 AC_SUBST(kernel_fi)
 AC_SUBST(include_fi)
 
+# Find installed Gforth
+AC_MSG_CHECKING([for gforth])
+GFORTH="`cd / && which gforth 2>/dev/null`"
+#the "$srcdir" = "." test defends agains the "../" bug in gforth-0.6.2
+(cd / && $GFORTH -e bye >/dev/null 2>/dev/null  && test "$srcdir" = ".") || GFORTH=""
+if test -z "$GFORTH"; then
+  PREFORTH='echo "You need to configure with a gforth in \$PATH to build this part" && false'
+  GFORTHKER='echo "You need to configure with a gforth in \$PATH to build this part" && false'
+  kernel_anti_dependence=''
+else
+  GFORTH_FI=`cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`
+  PREFORTH="$GFORTH -i $GFORTH_FI" ;
+  KERNLX_FI=`echo $GFORTH_FI | sed -e s/lib/share/g -e s/gforth.fi/kernl*.fi/g`
+  GFORTHKER="$GFORTH -i `echo $KERNLX_FI`" ;
+  kernel_anti_dependence='$(kernel_fi)'
+fi
+AC_SUBST(PREFORTH)
+AC_SUBST(GFORTHKER)
+AC_SUBST(kernel_anti_dependence)
+AC_MSG_RESULT($PREFORTH)
+
 #this breaks bindists
 #dnl replace srource directory by absolute value
 #if test $srcdir = "."; then srcdir=`pwd` 
@@ -1009,6 +1018,7 @@ vmgen
 machpc.fs
 envos.fs
 preforth
+gforthker
 engine/Makefile
 engine/libcc.h
 doc/version.texi
@@ -1018,6 +1028,7 @@ chmod +x gforthmi
 chmod +x vmgen
 chmod +x build-ec
 chmod +x preforth
+chmod +x gforthker
 test -d kernel||mkdir kernel
 if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi
 $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION