--- gforth/configure.in 2003/05/15 18:43:15 1.121 +++ gforth/configure.in 2003/09/08 13:03:06 1.135 @@ -21,12 +21,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.1],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.6.2],[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="March 11, 2003" +UPDATED="August 25, 2003" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -34,7 +34,7 @@ AC_CONFIG_HEADERS(engine/config.h) test "$CFLAGS" || CFLAGS=-O2 #default setting that may be changed later: -no_dynamic_default=0 +test "$no_dynamic_default" || no_dynamic_default=0 AC_ARG_ENABLE(force-reg, [ --enable-force-reg Use explicit register declarations if they appear in @@ -42,12 +42,18 @@ AC_ARG_ENABLE(force-reg, but also incorrect code with some gcc versions on some processors (default disabled).], AC_DEFINE(FORCE_REG,,[Define if you want to use explicit register declarations for better performance or for more convenient CODE words (does not work with all GCC versions on all machines)])) +AC_SUBST(PROFEXES) +AC_SUBST(PROFOBJS) +AC_ARG_ENABLE(prof, +[ --enable-prof Build gforth-prof, which outputs frequently occuring + sequences of primitives.], +PROFEXES="gforth-prof\$(EXE)"; PROFOBJS="engine-prof.o main-prof.o profile.o") AC_ARG_WITH(debug, -[ --with-debug specifies option -g to compile with debug info - --without-debug omits the -g switch and creates smaller images on - machines where "strip" has problems with gcc style - debugging informations.], +[ --with-debug specifies option -g to compile with debug info + --without-debug omits the -g switch and creates smaller images on + machines where "strip" has problems with gcc style + debugging informations.], if test "$withval" = "yes"; then DEBUGFLAG=-g; fi) dnl PEEPHOLE="yes" @@ -58,7 +64,7 @@ dnl but slower images.], dnl PEEPHOLE="$withval") #variables mentioned in INSTALL -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); gcc-2.95 recommended.]) AC_ARG_VAR(FORTHSIZES, [Gforth command line options for the default stack and dictionary sizes (see INSTALL).]) AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)]) AC_ARG_VAR(ac_cv_sizeof_char, [sizeof(char)]) @@ -68,7 +74,8 @@ AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(lo 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_c_bigendian, [Is the target big-endian ("yes" or "no)?]) +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]) #set up feature test macros, so the tests get them right: # turn on all POSIX, SUSv3, and GNU features if available @@ -96,6 +103,16 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor AC_SUBST(CC) AC_SUBST(DEBUGFLAG) +AC_MSG_CHECKING(make type) +make_type=`make -v 2>&1|grep 'ake version'|sed 's/ version .*//'` + +GNUMAKE='#' +test "$make_type" = "GNU Make" && GNUMAKE='' + +AC_MSG_RESULT($make_type) + +AC_SUBST(GNUMAKE) + dnl gcc-3.2 seems to work fine now dnl AC_MSG_CHECKING(gcc version) dnl gcc_version=`$CC -v 2>&1|grep 'gcc version'|sed 's/.*gcc version //'` @@ -123,7 +140,8 @@ case "$host_cpu" in machine=hppa $srcdir/mkinstalldirs arch/hppa AC_LIBOBJ(../arch/hppa/cache) - #LDFLAGS="$LDFLAGS -Xlinker -N" + #-N needed for --dynamic + LDFLAGS="$LDFLAGS -Xlinker -N" LIBS="$LIBS -L/lib/pa1.1/" ;; sparc*) @@ -144,6 +162,9 @@ case "$host_cpu" in CFLAGS="$CFLAGS -march=pentium" AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") ;; + x86_64) + machine=amd64 + ;; #generic should work for IA64 # ia64*) # machine=ia64 @@ -304,13 +325,19 @@ AC_TRY_COMPILE(,,ac_nostrictaliasing=yes CFLAGS="$CFLAGS_1" AC_MSG_RESULT($ac_nostrictaliasing) -# Try if GCC understands -fno-cross-jump -AC_MSG_CHECKING([if $CC understands -fno-cross-jump]) +# Try if GCC understands -fno-crossjumping +AC_MSG_CHECKING([if $CC understands -fno-crossjumping]) CFLAGS_1="$CFLAGS" -CFLAGS="$CFLAGS -fno-cross-jump" -AC_TRY_COMPILE(,,ac_nocrossjump=yes;ENGINE_FLAGS="$ENGINE_FLAGS -fno-cross-jump",ac_nocrossjump=no) +CFLAGS="$CFLAGS -fno-crossjumping" +AC_TRY_COMPILE(,,ac_nocrossjumping=yes;ENGINE_FLAGS="$ENGINE_FLAGS -fno-crossjumping",ac_nocrossjumping=no) CFLAGS="$CFLAGS_1" -AC_MSG_RESULT($ac_nocrossjump) +AC_MSG_RESULT($ac_nocrossjumping) + +# Try if GCC understands __attribute__((unused)) +AC_MSG_CHECKING([how to suppress 'unused variable' warnings]) +AC_TRY_COMPILE(,[int __attribute__((unused)) foo;], MAYBE_UNUSED='__attribute__((unused))',) +AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_UNUSED,[attribute for possibly unused variables]) +AC_MSG_RESULT($MAYBE_UNUSED) AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine) AC_SUBST(asm_fs) @@ -323,19 +350,25 @@ AC_PATH_PROG(INSTALL_INFO,install-info,[ case "$host_os" in *win32|cygwin) DIRSEP="\\\\" + PATHSEP=";" ;; *darwin*) #Darwin uses some funny preprocessor by default; eliminate it: - AC_MSG_NOTICE([using -traditional-cpp on Darwin]) + AC_MSG_NOTICE([using -no-cpp-precomp on Darwin]) CFLAGS="$CFLAGS -no-cpp-precomp" DIRSEP="/" + PATHSEP=":" ;; *) DIRSEP="/" + PATHSEP=":" ;; esac AC_SUBST(DIRSEP) AC_DEFINE_UNQUOTED(DIRSEP,'$DIRSEP',[a directory separator character]) +AC_SUBST(PATHSEP) +AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character]) + dnl Now a little support for DOS/DJGCC AC_SUBST(GFORTH_EXE) @@ -347,10 +380,6 @@ GFORTHITC_EXE="" AC_SUBST(GFORTHDITC_EXE) GFORTHDITC_EXE="" -PATHSEP=":" -AC_SUBST(PATHSEP) -AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character]) - AC_SUBST(FORTHSIZES) dnl if test "$PEEPHOLE" = "yes" @@ -430,6 +459,18 @@ 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(dl,dlopen) +dnl check for ffcall libraries +dnl 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) +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]) +AC_SUBST(FFCALLFLAG) +AC_SUBST(OLDCALLFLAG) if test "$host_os" != "nextstep3" then AC_FUNC_MEMCMP