--- gforth/configure.in 2011/11/16 23:15:05 1.292 +++ gforth/configure.in 2012/03/22 01:45:42 1.303 @@ -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,2008,2009,2010 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc. #This file is part of Gforth. @@ -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-20120317],[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="March 17, 2012" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -128,6 +128,7 @@ else fi]) #variables mentioned in INSTALL +AC_ARG_VAR(SH, [The shell]) AC_ARG_VAR(CC, [The C compiler (must support GNU C 2.x).]) AC_ARG_VAR(FORTHSIZES, [Gforth command line options for the default stack and dictionary sizes (see INSTALL).]) AC_ARG_VAR(STACK_CACHE_REGS, [number of registers in the maximum stack cache state for gforth-fast and gforth-native (default platform-dependent).]) @@ -176,6 +177,8 @@ AC_PROG_CC test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher) +test "x$SH" = "x" && SH="/bin/sh" + AC_MSG_CHECKING([whether to use two dispatches per conditional branch]) test x$condbranch_opt = x && if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then @@ -185,7 +188,9 @@ else fi AC_MSG_RESULT($condbranch_opt) AC_SUBST(condbranch_opt) +AC_SUBST(host_cpu) +AC_SUBST(SH) AC_SUBST(CC) AC_SUBST(GCC_LD) AC_SUBST(DEBUGFLAG) @@ -910,6 +915,7 @@ 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(rt,clock_gettime) if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then build_libcc_named=build-libcc-named @@ -962,9 +968,9 @@ if test "$host_os" != "nextstep3" then AC_FUNC_MEMCMP fi -AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh) +AC_REPLACE_FUNCS(memmove strtoul pow10 sincos strerror strsignal atanh) AC_FUNC_FSEEKO -AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep) +AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep clock_gettime) AC_CHECK_TYPES(stack_t,,,[#include ]) AC_DECL_SYS_SIGLIST AC_CHECK_FUNC(getopt_long,[true],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)]) @@ -990,17 +996,20 @@ GFORTH="`cd / && which gforth 2>/dev/nul (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' - KFORTH='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_FI=`echo $GFORTH_FI | sed -e s/lib/share/g -e s/gforth.fi/kernl*.fi/g` - KFORTH="$GFORTH -i `echo $KERNLX_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(KFORTH) +AC_SUBST(GFORTHKER) AC_SUBST(kernel_anti_dependence) AC_MSG_RESULT($PREFORTH) @@ -1018,7 +1027,8 @@ vmgen machpc.fs envos.fs preforth -kforth +libforth +gforthker engine/Makefile engine/libcc.h doc/version.texi @@ -1028,7 +1038,8 @@ chmod +x gforthmi chmod +x vmgen chmod +x build-ec chmod +x preforth -chmod +x kforth +chmod +x libforth +chmod +x gforthker test -d kernel||mkdir kernel if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION