--- gforth/configure.in 2008/04/22 14:50:59 1.221 +++ gforth/configure.in 2008/10/09 20:57:43 1.246 @@ -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,43 +20,23 @@ 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-20081006],[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="October 10, 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 @@ -128,6 +108,7 @@ AC_ARG_VAR(FORTHSIZES, [Gforth command l AC_ARG_VAR(STACK_CACHE_REGS, [number of registers in the maximum stack cache state for gforth-fast and gforth-native (default platform-dependent).]) AC_ARG_VAR(STACK_CACHE_DEFAULT_FAST, [number of registers in the default stack cache state for gforth-fast and gforth-native (default 1).]) AC_ARG_VAR(GCC_PR15242_WORKAROUND, [Force the enabling (1) or disabling (0) of a workaround for a gcc-3.x performance bug (default unset: use workaround for gcc-3.x)]) +AC_ARG_VAR(LIBCC_BUILD_SRC, [(Additional) libcc interface source files that should be processed on building and installation (default none)]) AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)]) AC_ARG_VAR(ac_cv_sizeof_void_p, [sizeof(void *)]) @@ -169,7 +150,7 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor AC_MSG_CHECKING([whether to use two dispatches per conditional branch]) test x$condbranch_opt = x && -if ($CC -v 2>&1 |grep -q 'gcc version 3'); then +if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then condbranch_opt=0 else condbranch_opt=1 @@ -322,7 +303,7 @@ case "$host_cpu" in AC_CHECK_FUNC(_sync_cache_range,[true],[AC_LIBOBJ(../arch/power/_sync_cache_range)]) #long long is broken on (at least) gcc-2.95.* for PPC test x$ac_cv_sizeof_long_long = x && - ($CC -v 2>&1 |grep -q 'gcc version 2.95') && + ($CC -v 2>&1 |grep 'gcc version 2.95' >/dev/null) && ac_cv_sizeof_long_long=0 #The only architecture with enough callee-saved registers test x$STACK_CACHE_REGS = x && STACK_CACHE_REGS=3 @@ -547,8 +528,12 @@ else fi fi -if grep -q FORCE_REG arch/$machine/machine.h; then - OPTS=`for i in $OPTS; do echo -n "$i-reg "; done`$OPTS +if grep FORCE_REG arch/$machine/machine.h >/dev/null; then + 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) @@ -632,19 +617,21 @@ else M4=m4 fi AC_SUBST(M4) -AC_DEFINE_UNQUOTED(M4,"$M4",[How to invoke m4]) AC_MSG_RESULT($M4) # Find installed Gforth AC_MSG_CHECKING([for gforth]) GFORTH="`cd / && which gforth 2>/dev/null`" +(cd / && $GFORTH -e bye >/dev/null 2>/dev/null) || 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: //'`" ; + 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'" @@ -678,6 +665,17 @@ case "$host_os" in DIRSEP="/" PATHSEP=":" DEFAULTSYSTEMPREFIX="" + #the following magic value was suggested by + #http://mail.python.org/pipermail/pythonmac-sig/2005-October/015190.html + AC_DEFINE_UNQUOTED(MACOSX_DEPLOYMENT_TARGET,"10.3",[an environment variable value needed by libtool on some MacOS X versions]) + ;; + *linux*) + DIRSEP="/" + PATHSEP=":" + DEFAULTSYSTEMPREFIX="" + if test "$wordsize" = 64; then + AC_DEFINE(LTDL_LIBRARY_PATH,"/lib64:/usr/lib64",[Define LTDL_LIBRARY_PATH for 64 bit Linux]) + fi ;; *) DIRSEP="/" @@ -821,31 +819,39 @@ 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(dl,dlopen) -dnl check for libffi 2.x +AC_CHECK_LIB(ltdl,lt_dlinit) +#check for libffi 2.x +AC_CHECK_HEADER(ffi.h,FFI_H_NAME=ffi.h,) +if test -z "$FFI_H_NAME"; then + AC_CHECK_HEADER(ffi/ffi.h,FFI_H_NAME=ffi/ffi.h,) +fi +AC_SUBST(FFI_H_NAME) AC_CHECK_LIB(ffi,ffi_call) -if test $ac_cv_lib_ffi_ffi_call = yes +if test -n "$FFI_H_NAME" -a $ac_cv_lib_ffi_ffi_call = yes then -LIBFFIFLAG="true" -FFCALLFLAG="false" -OLDCALLFLAG="false" -AC_DEFINE(HAS_LIBFFI,,[define this if you want to use the ffcall interface with libffi 2.0]) + LIBFFIFLAG="true" + LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC libffi.fs" else -dnl check for ffcall libraries -dnl unfortunately, these four calls are separated out into a library each. + LIBFFIFLAG="false" +fi +#check for ffcall libraries +#unfortunately, these four calls are separated out into a library each. AC_CHECK_LIB(avcall,__builtin_avcall) -AC_CHECK_LIB(callback,__vacall_r) -AC_CHECK_LIB(vacall,vacall) -AC_CHECK_LIB(trampoline,alloc_trampoline) -LIBFFIFLAG="false" -FFCALLFLAG="false" -OLDCALLFLAG="true" -test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && OLDCALLFLAG="false" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries]) -test $ac_cv_lib_avcall___builtin_avcall = no && AC_DEFINE(HAS_OLDCALL,,[define this if you want to use the old call libraries]) +dnl AC_CHECK_LIB(callback,__vacall_r) +dnl AC_CHECK_LIB(vacall,vacall) +dnl AC_CHECK_LIB(trampoline,alloc_trampoline) +if test $ac_cv_lib_avcall___builtin_avcall = yes; then + FFCALLFLAG="true" + LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC fflib.fs" +else + FFCALLFLAG="false" +fi +if test $LIBFFIFLAG = false -a $FFCALLFLAG = false; then + AC_MSG_WARN([The (old) lib.fs foreign function interface needs either libffi or the ffcall libraries]) fi AC_SUBST(LIBFFIFLAG) AC_SUBST(FFCALLFLAG) -AC_SUBST(OLDCALLFLAG) +AC_SUBST(LIBCC_BUILD_SRC) if test "$host_os" != "nextstep3" then AC_FUNC_MEMCMP @@ -860,7 +866,7 @@ AC_CHECK_FUNCS(expm1 log1p) AC_REPLACE_FUNCS(rint ecvt) dnl No check for select, because our replacement is no good under dnl anything but DOS -AC_CHECK_HEADERS(sys/mman.h fnmatch.h) +AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h) AC_FUNC_FNMATCH test $ac_cv_func_fnmatch_works = yes || AC_LIBOBJ(fnmatch) AC_CHECK_FUNCS(mmap sysconf getpagesize) @@ -884,6 +890,7 @@ gforthmi vmgen machpc.fs envos.fs +preforth engine/Makefile engine/libcc.h doc/version.texi @@ -892,6 +899,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]])