--- gforth/configure.in 2011/11/15 12:56:28 1.291 +++ gforth/configure.in 2011/11/17 22:29:17 1.294 @@ -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.7.9-20101227],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.7.9-20111117],[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="December 27, 2010" +UPDATED="November 17, 2011" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -705,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) @@ -999,6 +983,30 @@ 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_FI1=`echo $GFORTH_FI | sed -e s/lib/share/g -e s/gforth.fi/kernl*.fi/g` + KERNLX_FI2=`echo $GFORTH_FI | sed -e s/gforth.fi/kernl*.fi/g` + test -f $KERNLX_FI1 && KERNLX_FI=$KERNLX_FI1 + test -f $KERNLX_FI2 && KERNLX_FI=$KERNLX_FI2 + 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` @@ -1013,6 +1021,7 @@ vmgen machpc.fs envos.fs preforth +gforthker engine/Makefile engine/libcc.h doc/version.texi @@ -1022,6 +1031,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