--- gforth/configure.in 2008/04/05 20:34:13 1.218 +++ gforth/configure.in 2008/07/17 15:25:25 1.233 @@ -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-20080405],[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) +#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 @@ -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) @@ -610,11 +624,13 @@ AC_MSG_CHECKING([for 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_DEFINE_UNQUOTED(PREFORTH,"$PREFORTH",[How to invoke the pre-installed gforth]) +AC_SUBST(kernel_anti_dependence) AC_MSG_RESULT($PREFORTH) #echo "machine='$machine'" @@ -792,7 +808,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 @@ -855,6 +870,7 @@ gforthmi vmgen machpc.fs envos.fs +preforth engine/Makefile engine/libcc.h doc/version.texi @@ -863,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]])