--- gforth/configure.in 2008/04/20 19:36:16 1.220 +++ gforth/configure.in 2008/05/04 17:53:29 1.225 @@ -20,7 +20,7 @@ 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-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. @@ -29,34 +29,14 @@ UPDATED="February 23, 2008" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) -#ltdl stuff: -AC_CONFIG_MACRO_DIR([libltdl/m4]) -LT_CONFIG_LTDL_DIR([libltdl]) -LT_INIT([dlopen]) -LTDL_INIT([subproject],[convenience]) -AC_CONFIG_AUX_DIR([libltdl/config]) - -# check for ltdl features we need -# The lt_dladvise_init symbol was added with libtool-2.2 -if test "x$with_included_ltdl" != "xyes"; then - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $LTDLINCL" - LDFLAGS="$LDFLAGS $LIBLTDL" - AC_CHECK_LIB([ltdl], [lt_dladvise_init], - [], - [AC_MSG_ERROR([libltdl-2.2 or later needed; configure with --with-included-ltdl])]) - LDFLAGS="$save_LDFLAGS" - CFLAGS="$save_CFLAGS" -fi - -#how to link with libltdl -if test "x$with_included_ltdl" = "xyes"; then - #hard-code it (hopefully portable); the official way is to use automake :-( - LTDL_LDLIBS='-L $(top_builddir)/libltdl/.libs -lltdlc' -else - LTDL_LDLIBS='$(LIBLTDL)' -fi +#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 @@ -549,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) @@ -821,6 +803,7 @@ dnl Checks for library functions dnl This check is just for making later checks link with libm. 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) @@ -884,6 +867,7 @@ gforthmi vmgen machpc.fs envos.fs +preforth engine/Makefile engine/libcc.h doc/version.texi @@ -892,6 +876,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]])