--- gforth/configure.in 2010/05/17 09:01:11 1.277 +++ gforth/configure.in 2011/04/19 16:19:32 1.289 @@ -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 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 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.0-20090215],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.7.9-20101227],[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="November 8, 2008" +UPDATED="December 27, 2010" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -242,14 +242,20 @@ case "$host_cpu" in ;; i486) machine=386 - CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -m486" + CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr" + CFLAGS_1="$CFLAGS" + CFLAGS="$CFLAGS -march=i486" + AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") + AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1") ;; i*86) machine=386 CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr" CFLAGS_1="$CFLAGS" - CFLAGS="$CFLAGS -march=pentium" + CFLAGS="$CFLAGS -march=pentium -mtune=generic" + AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -march=pentium") AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") + AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1") ;; x86_64) case $CC @@ -282,6 +288,7 @@ case "$host_cpu" in ;; mips*) machine=mips + AC_LIBOBJ(../arch/mips/check_prim) #dynamic native code has the following problems on MIPS: # #1) J/JAL seems relocatable, but is are only @@ -662,6 +669,12 @@ AC_TRY_COMPILE(,[int __attribute__((unus AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_UNUSED,[attribute for possibly unused variables]) AC_MSG_RESULT($MAYBE_UNUSED) +# Try if GCC understands __thread +AC_MSG_CHECKING([whether gcc understands '__thread']) +AC_TRY_COMPILE(,[extern __thread int foo;],PER_THREAD='__thread',) +AC_DEFINE_UNQUOTED(PER_THREAD,$PER_THREAD,[storage class for thread-local variables]) +AC_MSG_RESULT($PER_THREAD) + #try if m4 understands -s AC_MSG_CHECKING([how to invoke m4]) if m4 -s /dev/null >/dev/null 2>&1; then @@ -693,14 +706,16 @@ AC_MSG_RESULT($PREFORTH) dnl AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine) if test x$EC_MODE = xfalse then - AC_CHECK_FILE($srcdir/arch/$machine/asm.fs,[asm_fs=arch/$machine/asm.fs],) + AS_IF([test -f $srcdir/arch/$machine/asm.fs], + [asm_fs=arch/$machine/asm.fs]) fi AC_SUBST(asm_fs) dnl AC_CHECK_PROG(disasm_fs,disasm.fs,arch/$machine/disasm.fs,,$srcdir/arch/$machine) if test x$EC_MODE = xfalse then - AC_CHECK_FILE($srcdir/arch/$machine/disasm.fs,[disasm_fs=arch/$machine/disasm.fs],) + AS_IF([test -f $srcdir/arch/$machine/disasm.fs], + [disasm_fs=arch/$machine/disasm.fs]) fi AC_SUBST(disasm_fs) @@ -805,7 +820,11 @@ fi #echo "CFLAGS=$CFLAGS" #echo "ac_link=$ac_link" AC_MSG_CHECKING([if and how we can waste code space]) -if test -z "$skipcode"; then +if test -z "$skipcode" && test x$cross_compiling = xyes; then + # we cannot perform the AC_TRY_RUN check when cross-compiling. + skipcode=no + AC_MSG_RESULT([$skipcode, can't run checks since cross-compiling]) +elif test -z "$skipcode"; then skipcode=no CFLAGS_1="$CFLAGS" CFLAGS="$CFLAGS $ENGINE_FLAGS" @@ -843,7 +862,7 @@ then no_dynamic_default=1 AC_MSG_WARN(Disabling default dynamic native code generation) fi - AC_DEFINE_UNQUOTED(SKIP16,((void)0),statement for skipping 16 bytes) + AC_DEFINE_UNQUOTED(SKIP16,asm(""),statement for skipping 16 bytes) else AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes) fi @@ -874,6 +893,11 @@ AC_PROG_LN_S AC_PROG_INSTALL AC_CHECK_PROGS(TEXI2DVI,texi2dvi4a2ps texi2dvi) +dnl check for the presence of Emacs +AC_CHECK_PROGS(EMACS,emacs xemacs) +test -n "$EMACS" && gforth_elc=gforth.elc +AC_SUBST(gforth_elc) + dnl MacOS X has a libtool that does something else AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool) @@ -904,7 +928,7 @@ 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) +AC_CHECK_LIB(ffi,ffi_call,LIBS="$LIBS") if test -n "$FFI_H_NAME" -a $ac_cv_lib_ffi_ffi_call = yes then LIBFFIFLAG="true" @@ -914,7 +938,7 @@ else 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(avcall,__builtin_avcall,LIBS="$LIBS") dnl AC_CHECK_LIB(callback,__vacall_r) dnl AC_CHECK_LIB(vacall,vacall) dnl AC_CHECK_LIB(trampoline,alloc_trampoline)