--- gforth/configure.in 2008/08/08 20:56:14 1.235 +++ gforth/configure.in 2008/10/20 11:56:58 1.256 @@ -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.6.9-20080716],[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="July 16, 2008" +UPDATED="October 10, 2008" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -108,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 *)]) @@ -117,12 +118,15 @@ AC_ARG_VAR(ac_cv_sizeof_int, [sizeof(int AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(long)]) AC_ARG_VAR(ac_cv_sizeof_long_long, [sizeof(long long)]) AC_ARG_VAR(ac_cv_sizeof_intptr_t, [sizeof(intptr_t)]) +AC_ARG_VAR(ac_cv_sizeof_int128_t, [sizeof(int128_t)]) +AC_ARG_VAR(ac_cv_sizeof_uint128_t, [sizeof(uint128_t)]) AC_ARG_VAR(ac_cv_c_bigendian, [Is the target big-endian ("yes" or "no")?]) AC_ARG_VAR(no_dynamic_default, [run gforth with --dynamic (0) or --no-dynamic (1) by default]) AC_ARG_VAR(condbranch_opt, [enable (1) or disable (0) using two dispatches for conditional branches]) AC_ARG_VAR(skipcode, [assembly code for skipping 16 bytes of code]) AC_ARG_VAR(asmcomment, [assembler comment start string]) AC_ARG_VAR(arm_cacheflush, [file containing ARM cacheflush function (without .c)]) +AC_ARG_VAR(LTDL_LIBRARY_PATH, [additional directories for libltdl (for some 64-bit platforms)]) #set up feature test macros, so the tests get them right: # turn on all POSIX, SUSv3, and GNU features if available @@ -149,7 +153,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 @@ -286,7 +290,7 @@ case "$host_cpu" in #particular, the delay slots of LW, MFLO, etc.) # #Therefore we disable dynamic native code by default: - if test -z $no_dynamic_default; then + if test -z "$no_dynamic_default"; then no_dynamic_default=1 AC_MSG_WARN([Disabling default dynamic native code generation (relocation and delay slot issues)]) fi @@ -302,7 +306,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 @@ -527,7 +531,7 @@ else fi fi -if grep -q FORCE_REG arch/$machine/machine.h; then +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" @@ -616,17 +620,17 @@ 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) @@ -664,6 +668,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 -z "$LTDL_LIBRARY_PATH" -a "$wordsize" = 64; then + LTDL_LIBRARY_PATH=`/sbin/ldconfig -p |tail -n +2 |sed 's/^.* => //'|sed 's|/[[^/]]*$||'| grep 64 | sort -u | tr '\n' : | sed -e 's/:$//'` + fi ;; *) DIRSEP="/" @@ -677,6 +692,9 @@ AC_SUBST(PATHSEP) AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character]) AC_SUBST(DEFAULTSYSTEMPREFIX) AC_DEFINE_UNQUOTED(DEFAULTSYSTEMPREFIX,"$DEFAULTSYSTEMPREFIX",[default for environment variable GFORTHSYSTEMPREFIX]) +if test -n "$LTDL_LIBRARY_PATH"; then + AC_DEFINE_UNQUOTED(LTDL_LIBRARY_PATH,"$LTDL_LIBRARY_PATH",[Define LTDL_LIBRARY_PATH for 64 bit Linux]) +fi #work around SELinux brain damage (from Andrew Haley <12t8f3jakb74g2c@news.supernews.com>) #This magic incantation seems to be completely undocumented. @@ -719,7 +737,7 @@ dnl the following macro produces a warni AC_C_BIGENDIAN AC_SUBST(KERNEL) dnl ac_cv_c_bigendian is an undocumented variable of autoconf-2.1 -if test $ac_cv_c_bigendian = yes; then +if test $ac_cv_c_bigendian != no; then bytesex=b KERNEL="kernl16b.fi kernl16l.fi kernl32b.fi kernl32l.fi kernl64b.fi kernl64l.fi" else @@ -809,10 +827,16 @@ dnl using sin here is no good idea since AC_CHECK_LIB(m,asin) 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" + LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC libffi.fs" else LIBFFIFLAG="false" fi @@ -824,6 +848,7 @@ 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 @@ -832,6 +857,7 @@ if test $LIBFFIFLAG = false -a $FFCALLFL fi AC_SUBST(LIBFFIFLAG) AC_SUBST(FFCALLFLAG) +AC_SUBST(LIBCC_BUILD_SRC) if test "$host_os" != "nextstep3" then AC_FUNC_MEMCMP @@ -846,10 +872,10 @@ 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 wchar.h) AC_FUNC_FNMATCH test $ac_cv_func_fnmatch_works = yes || AC_LIBOBJ(fnmatch) -AC_CHECK_FUNCS(mmap sysconf getpagesize) +AC_CHECK_FUNCS(mmap sysconf getpagesize wcwidth) AM_PATH_LISPDIR kernel_fi=kernl${vwordsize}${bytesex}.fi