Diff for /gforth/configure.in between versions 1.298 and 1.320

version 1.298, 2012/02/09 01:36:47 version 1.320, 2012/10/21 21:55:19
Line 20  dnl Process this file with autoconf to p Line 20  dnl Process this file with autoconf to p
   
 dnl We use some automake macros here,  dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in  dnl but don't use automake for creating Makefile.in
 AC_INIT([gforth],[0.7.9-20120209],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])  AC_INIT([gforth],[0.7.9-20121007],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
 AC_PREREQ(2.54)  AC_PREREQ(2.54)
 #snapshots have numbers major.minor.release-YYYYMMDD  #snapshots have numbers major.minor.release-YYYYMMDD
 #note that lexicographic ordering must be heeded.  #note that lexicographic ordering must be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!  #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
 UPDATED="November 17, 2011"  UPDATED="October 7, 2012"
 AC_SUBST(UPDATED)  AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)  AC_CONFIG_HEADERS(engine/config.h)
   
Line 110  else Line 110  else
   platform=${withval}    platform=${withval}
 fi])  fi])
   
   AC_ARG_ENABLE(lib,
           AC_HELP_STRING([--enable-lib],
                          [  Compile Gforth as shared library (default disabled).]),
           ,enable_lib=no)
   if test "$enable_lib" != "no"; then
      AC_DEFINE(HAS_LIB,,[Define if you want to build as shared library])
      libengines=libgforths
      libinstall=libinstall
      LIB_VERSION=0:8:0
   fi
   AC_SUBST(libengines)
   AC_SUBST(libinstall)
   AC_SUBST(LIB_VERSION)
   
 AC_ARG_WITH(cross,  AC_ARG_WITH(cross,
         AC_HELP_STRING([--with-cross=<arch>],          AC_HELP_STRING([--with-cross=<arch>],
                         [  Build gforth using a cross compiler.]),                          [  Build gforth using a cross compiler.]),
Line 127  else Line 141  else
   NO_CROSS="#"    NO_CROSS="#"
 fi])  fi])
   
   AC_ARG_WITH(arch,
           AC_HELP_STRING([--with-arch=<arch>],
                           [  Build gforth binaries with <arch> postfix]),
   [if test "$withval" = "no"; then
     ARCH=""
   else
     ARCH=-${withval}
   fi])
   AC_SUBST(ARCH)
   
 #variables mentioned in INSTALL  #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(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(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).])  AC_ARG_VAR(STACK_CACHE_REGS, [number of registers in the maximum stack cache state for gforth-fast and gforth-native (default platform-dependent).])
Line 176  AC_PROG_CC Line 201  AC_PROG_CC
   
 test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher)  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])  AC_MSG_CHECKING([whether to use two dispatches per conditional branch])
 test x$condbranch_opt = x &&   test x$condbranch_opt = x && 
 if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then  if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then
Line 185  else Line 212  else
 fi  fi
 AC_MSG_RESULT($condbranch_opt)  AC_MSG_RESULT($condbranch_opt)
 AC_SUBST(condbranch_opt)  AC_SUBST(condbranch_opt)
   AC_SUBST(host_cpu)
   
   AC_SUBST(SH)
 AC_SUBST(CC)  AC_SUBST(CC)
 AC_SUBST(GCC_LD)  AC_SUBST(GCC_LD)
 AC_SUBST(DEBUGFLAG)  AC_SUBST(DEBUGFLAG)
Line 198  AC_SUBST(engine_fast2) Line 227  AC_SUBST(engine_fast2)
 AC_SUBST(no_dynamic)  AC_SUBST(no_dynamic)
 AC_SUBST(image_i)  AC_SUBST(image_i)
 AC_SUBST(signals_o)  AC_SUBST(signals_o)
   AC_SUBST(mi_prefix)
   
 #this is used to disable some (not generally essential) part of the  #this is used to disable some (not generally essential) part of the
 #Makefile that some makes don't grok.  It would be better to test for  #Makefile that some makes don't grok.  It would be better to test for
Line 209  test "$make_type" = "GNU Make" && GNUMAK Line 239  test "$make_type" = "GNU Make" && GNUMAK
 AC_MSG_RESULT($make_type)  AC_MSG_RESULT($make_type)
 AC_SUBST(GNUMAKE)  AC_SUBST(GNUMAKE)
   
 AC_MSG_CHECKING([whether the linker accepts -export-dynamic])  if test "$ac_export_dynamic" != yes; then
 OLDLDFLAGS=$LDFLAGS    AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
 LDFLAGS="$LDFLAGS -export-dynamic"    OLDLDFLAGS=$LDFLAGS
 dnl AC_TRY_LINK gives false positive on rs6000-ibm-aix4.2.1.0    LDFLAGS="$LDFLAGS -export-dynamic"
 dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no)    dnl AC_TRY_LINK gives false positive on rs6000-ibm-aix4.2.1.0
 AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no)    dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no)
 test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS    AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no)
 AC_MSG_RESULT($ac_export_dynamic)    test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS
     AC_MSG_RESULT($ac_export_dynamic)
   else
     LDFLAGS="$LDFLAGS -export-dynamic"
   fi
   
 #terminology is a bit unusual here: The host is the system on which  #terminology is a bit unusual here: The host is the system on which
 #gforth will run; the system on which configure will run is the `build'  #gforth will run; the system on which configure will run is the `build'
Line 227  case "$host_cpu" in Line 261  case "$host_cpu" in
                 if test x$platform = xnxt; then                  if test x$platform = xnxt; then
                    CFLAGS="$CFLAGS -mthumb -mthumb-interwork"                     CFLAGS="$CFLAGS -mthumb -mthumb-interwork"
                 fi                  fi
                   case "$host_os" in
                        *android*)
                           CFLAGS="$CFLAGS -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
                           ;;
                   esac
                 if test -z $arm_cacheflush; then                  if test -z $arm_cacheflush; then
                    case "$host_os" in                     case "$host_os" in
                      *linux*)                       *linux*)
Line 690  AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_U Line 729  AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_U
 AC_MSG_RESULT($MAYBE_UNUSED)  AC_MSG_RESULT($MAYBE_UNUSED)
   
 # Try if GCC understands __thread  # Try if GCC understands __thread
 AC_MSG_CHECKING([whether gcc understands '__thread'])  AC_CACHE_CHECK([whether gcc understands '__thread'], [ac_cv_thread],
 AC_TRY_COMPILE(,[extern __thread int foo;],PER_THREAD='__thread',)       [AC_TRY_COMPILE(,[extern __thread int foo;],
                           [ac_cv_thread=yes],
                           [ac_cv_thread=no])])
   test x$ac_cv_thread = xyes && PER_THREAD='__thread'
 AC_DEFINE_UNQUOTED(PER_THREAD,$PER_THREAD,[storage class for thread-local variables])  AC_DEFINE_UNQUOTED(PER_THREAD,$PER_THREAD,[storage class for thread-local variables])
 AC_MSG_RESULT($PER_THREAD)  
   
 #try if m4 understands -s  #try if m4 understands -s
 AC_MSG_CHECKING([how to invoke m4])  AC_MSG_CHECKING([how to invoke m4])
Line 726  AC_SUBST(disasm_fs) Line 767  AC_SUBST(disasm_fs)
 AC_PATH_PROG(INSTALL_INFO,install-info,[echo '>>>>Please make info dir entry:'],$PATH:/sbin:/usr/sbin:/usr/local/sbin)  AC_PATH_PROG(INSTALL_INFO,install-info,[echo '>>>>Please make info dir entry:'],$PATH:/sbin:/usr/sbin:/usr/local/sbin)
   
 case "$host_os" in  case "$host_os" in
         *win32*)  
                 # !!!FIXME!!! problems with cygwin and ';' as path separator  
                 DIRSEP="\\\\"  
                 PATHSEP=";"  
                 #we want the builtins of command.com/cmd.exe and its  
                 # handling of .com files.  
                 #$COMSPEC contains the name of the Windows shell;  
                 # the ./ is there, because the bash does not recognize  
                 # absolute DOS filenames  
                 DEFAULTSYSTEMPREFIX="./$COMSPEC /c "  
                 ;;  
         *darwin*)          *darwin*)
                   #dar*win* must be first, not to confuse with cygwin, win32 or similar
                 #Darwin uses some funny preprocessor by default; eliminate it:                  #Darwin uses some funny preprocessor by default; eliminate it:
                 AC_MSG_NOTICE([using -no-cpp-precomp on Darwin])                  AC_MSG_NOTICE([using -no-cpp-precomp on Darwin])
                 CFLAGS="$CFLAGS -no-cpp-precomp"                  CFLAGS="$CFLAGS -no-cpp-precomp"
Line 748  case "$host_os" in Line 779  case "$host_os" in
                 #http://mail.python.org/pipermail/pythonmac-sig/2005-October/015190.html                  #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])                  AC_DEFINE_UNQUOTED(MACOSX_DEPLOYMENT_TARGET,"10.3",[an environment variable value needed by libtool on some MacOS X versions])
                 ;;                  ;;
           *win*)
                   # !!!FIXME!!! problems with cygwin and ';' as path separator
                   DIRSEP="/" # normal dirsep
                   PATHSEP=":" # colon as pathsep
                   #we don't want the builtins of command.com/cmd.exe and its
                   # handling of .com files.
                   #$COMSPEC contains the name of the Windows shell;
                   # the ./ is there, because the bash does not recognize
                   # absolute DOS filenames
                   DEFAULTSYSTEMPREFIX="" #"./${COMSPEC//\\/\\\\\\\\} /c "
                   ;;
         *linux*)          *linux*)
                 DIRSEP="/"                  DIRSEP="/"
                 PATHSEP=":"                  PATHSEP=":"
Line 910  dnl This check is just for making later Line 952  dnl This check is just for making later
 dnl using sin here is no good idea since it is built-into gcc and typechecked  dnl using sin here is no good idea since it is built-into gcc and typechecked
 AC_CHECK_LIB(m,asin)  AC_CHECK_LIB(m,asin)
 AC_CHECK_LIB(ltdl,lt_dlinit)  AC_CHECK_LIB(ltdl,lt_dlinit)
   dnl ,LIB_SUFFIX=.la,LIB_SUFFIX=.so)
   if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then
     LIB_SUFFIX=.la
   else
     LIB_SUFFIX=.so
   fi
   AC_SUBST(LIB_SUFFIX)
 AC_CHECK_LIB(rt,clock_gettime)  AC_CHECK_LIB(rt,clock_gettime)
   
 if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then  if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then
   build_libcc_named=build-libcc-named    build_libcc_named=build-libcc-named
 else  else
   build_libcc_named=""  
   AC_MSG_WARN([No GNU_LIBTOOL found, skip pre-building libcc-based libraries])    AC_MSG_WARN([No GNU_LIBTOOL found, skip pre-building libcc-based libraries])
 fi  fi
 AC_SUBST(build_libcc_named)  AC_SUBST(build_libcc_named)
Line 963  if test "$host_os" != "nextstep3" Line 1011  if test "$host_os" != "nextstep3"
 then  then
         AC_FUNC_MEMCMP          AC_FUNC_MEMCMP
 fi  fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)  AC_REPLACE_FUNCS(memmove strtoul pow10 sincos strerror strsignal atanh)
 AC_FUNC_FSEEKO  AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep clock_gettime)  AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep clock_gettime)
 AC_CHECK_TYPES(stack_t,,,[#include <signal.h>])  AC_CHECK_TYPES(stack_t,,,[#include <signal.h>])
Line 996  if test -z "$GFORTH"; then Line 1044  if test -z "$GFORTH"; then
 else  else
   GFORTH_FI=`cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`    GFORTH_FI=`cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`
   PREFORTH="$GFORTH -i $GFORTH_FI" ;    PREFORTH="$GFORTH -i $GFORTH_FI" ;
   KERNLX_FI1=`echo $GFORTH_FI | sed -e s/lib/share/g -e s/gforth.fi/kernl*.fi/g`    KERNLX_FI1=`echo $GFORTH_FI | sed -e s/lib[64]*/share/g -e s/gforth.fi/kernl*.fi/g`
   KERNLX_FI2=`echo $GFORTH_FI | sed -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_FI1 && KERNLX_FI=$KERNLX_FI1
   test -f $KERNLX_FI2 && KERNLX_FI=$KERNLX_FI2    test -f $KERNLX_FI2 && KERNLX_FI=$KERNLX_FI2
Line 1007  AC_SUBST(PREFORTH) Line 1055  AC_SUBST(PREFORTH)
 AC_SUBST(GFORTHKER)  AC_SUBST(GFORTHKER)
 AC_SUBST(kernel_anti_dependence)  AC_SUBST(kernel_anti_dependence)
 AC_MSG_RESULT($PREFORTH)  AC_MSG_RESULT($PREFORTH)
   AC_DEFINE_UNQUOTED(KERNEL, "$kernel_fi", [The kernel to load in the image])
   AC_DEFINE_UNQUOTED(ARCH, "$machine", [architecture to run on ])
   
 #this breaks bindists  #this breaks bindists
 #dnl replace srource directory by absolute value  #dnl replace srource directory by absolute value
Line 1018  AC_CONFIG_FILES([ Line 1068  AC_CONFIG_FILES([
 Makefile  Makefile
 Makedist  Makedist
 gforthmi  gforthmi
   gforthmi.sh
 vmgen  vmgen
 machpc.fs  machpc.fs
 envos.fs  envos.fs
 preforth  preforth
   libforth
 gforthker  gforthker
 engine/Makefile  engine/Makefile
 engine/libcc.h  engine/libcc.h
Line 1032  chmod +x gforthmi Line 1084  chmod +x gforthmi
 chmod +x vmgen  chmod +x vmgen
 chmod +x build-ec  chmod +x build-ec
 chmod +x preforth  chmod +x preforth
   chmod +x libforth
 chmod +x gforthker  chmod +x gforthker
 test -d kernel||mkdir kernel  test -d kernel||mkdir kernel
 if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi  if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi
 $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION  $srcdir/mkinstalldirs include/gforth$ARCH/$PACKAGE_VERSION
 $srcdir/mkinstalldirs arch/$machine  $srcdir/mkinstalldirs arch/$machine
 ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],  ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth$ARCH/$PACKAGE_VERSION]],
 [PACKAGE_VERSION=$PACKAGE_VERSION  [PACKAGE_VERSION=$PACKAGE_VERSION
  machine=$machine])   machine=$machine
    ARCH=$ARCH])
 AC_OUTPUT  AC_OUTPUT

Removed from v.1.298  
changed lines
  Added in v.1.320


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>