--- gforth/configure.in 1999/10/30 15:48:16 1.57 +++ gforth/configure.in 2000/07/27 09:32:01 1.70 @@ -22,7 +22,7 @@ AC_INIT(engine/engine.c) dnl We use some automake macros here, dnl but don't use automake for creating Makefile.in -AM_INIT_AUTOMAKE(gforth,0.4.9-19990617) +AM_INIT_AUTOMAKE(gforth,0.4.9-20000726) #snapshots have numbers major.minor.release-YYYYMMDD #note that lexicographic ordering bust be heeded. #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1! @@ -148,7 +148,9 @@ fi AC_MSG_CHECKING([whether the linker accepts -export-dynamic]) OLDLDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -export-dynamic" -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 +dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no) +AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no) test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS AC_MSG_RESULT($ac_export_dynamic) @@ -207,12 +209,12 @@ case "$host_cpu" in machine=386 CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem" CFLAGS_1="$CFLAGS" - CFLAGS="$CFLAGS -mpentiumpro" + CFLAGS="$CFLAGS -mpentium" AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") if test "${enable_direct_threaded+set}" = "" \ -a "${enable_indirect_threaded+set}" = "" then - echo "Using direct threaded code on PPro/Pentium II" + echo "Using direct threaded code on Athlon/PPro/Pentium II/Pentium III" AC_DEFINE(DIRECT_THREADED) fi ;; @@ -243,11 +245,25 @@ case "$host_cpu" in ;; alpha*) machine=alpha + #full IEEE FP support for more uniformity across platforms: + CFLAGS="$CFLAGS -mieee" ;; - power*) + power*|rs6000) machine=power $srcdir/mkinstalldirs arch/power AC_CHECK_FUNC(_sync_cache_range,true,LIBOBJS="$LIBOBJS ../arch/power/_sync_cache_range.o") + #link text segment into first 32MB + AC_MSG_CHECKING([whether the linker accepts --script=arch/power/elf32ppc.x]) + OLDLDFLAGS=$LDFLAGS + #the -L../$srcdir helps when $srcdir is relative + LDFLAGS="$LDFLAGS -L$srcdir -L../$srcdir -Xlinker --script=$srcdir/arch/power/elf32ppc.x" + AC_TRY_LINK(,,ac_link_script=yes,ac_link_script=no) + test $ac_link_script = yes||LDFLAGS=$OLDLDFLAGS + AC_MSG_RESULT($ac_link_script) + AC_MSG_CHECKING([whether the code is in the first 32MB]) + AC_TRY_RUN([main(){label: exit(((unsigned long)&&label)>32000000UL);}],ac_code_under_32=yes,ac_code_under_32=no,ac_code_under_32=no) + AC_MSG_RESULT($ac_code_under_32) + test $ac_code_under_32 = yes||(AC_MSG_WARN([Using indirect threading]); AC_DEFINE(INDIRECT_THREADED)) ;; *) echo "No direct threading support for $host_cpu, using indirect threading." @@ -260,6 +276,12 @@ esac AC_SUBST(host) AC_SUBST(ENGINE_FLAGS) +AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine) +AC_SUBST(asm_fs) + +AC_CHECK_PROG(disasm_fs,disasm.fs,arch/$machine/disasm.fs,,$srcdir/arch/$machine) +AC_SUBST(disasm_fs) + case "$host_os" in *win32) EXE=".exe" @@ -328,7 +350,9 @@ AC_CHECK_FUNCS(rint expm1 log1p) AC_REPLACE_FUNCS(ecvt) dnl No check for select, because our replacement is no good under dnl anything but DOS -AC_CHECK_HEADERS(sys/mman.h) +AC_CHECK_HEADERS(sys/mman.h fnmatch.h) +AC_FUNC_FNMATCH +test $ac_cv_func_fnmatch_works = yes || LIBOBJS="$LIBOBJS fnmatch.o" AC_CHECK_FUNCS(mmap sysconf getpagesize) AM_PATH_LISPDIR