--- gforth/configure.in	1999/01/08 16:58:30	1.48
+++ gforth/configure.in	2000/07/20 13:29:43	1.67
@@ -22,12 +22,12 @@ 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.0-19990101)
+AM_INIT_AUTOMAKE(gforth,0.4.9-20000720)
 #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!
 AM_CONFIG_HEADER(engine/config.h)
-AM_CYGWIN32
+#AM_CYGWIN32
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -145,6 +145,13 @@ else
   AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell)
 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)
+test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS
+AC_MSG_RESULT($ac_export_dynamic)
+
 #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'
 AC_CANONICAL_HOST
@@ -153,7 +160,7 @@ case "$host_cpu" in
 		machine=hppa
 		$srcdir/mkinstalldirs arch/hppa
 		LIBOBJS="$LIBOBJS ../arch/hppa/cache.o"
-		LDFLAGS="-Xlinker -N"
+		LDFLAGS="$LDFLAGS -Xlinker -N"
 		LIBS="$LIBS -L/lib/pa1.1/"
 		if test "${enable_direct_threaded+set}" = ""
 		then
@@ -183,16 +190,32 @@ case "$host_cpu" in
 			AC_DEFINE(DIRECT_THREADED)
 		fi
 		;;
-	i586|i686)
+	i586)
 		machine=386
-		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486"
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
+		CFLAGS_1="$CFLAGS"
+		CFLAGS="$CFLAGS -mpentium"
+		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
 		if test "${enable_direct_threaded+set}" = "" \
 			-a "${enable_indirect_threaded+set}" = ""
 		then
-			echo "Using indirect threaded code on Pentium and up"
+			echo "Using indirect threaded code on Pentium/K5/K6"
 			AC_DEFINE(INDIRECT_THREADED)
 		fi
 		;;
+	i686)
+		machine=386
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
+		CFLAGS_1="$CFLAGS"
+		CFLAGS="$CFLAGS -mpentiumpro"
+		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 Athlon/PPro/Pentium II/Pentium III"
+			AC_DEFINE(DIRECT_THREADED)
+		fi
+		;;
         m68k)
 		machine=m68k
 		CFLAGS="$CFLAGS -fomit-frame-pointer"
@@ -204,20 +227,41 @@ case "$host_cpu" in
 	mips*)
 		machine=mips
 		#link text and data segment into the same 256M region!
+		AC_MSG_CHECKING([whether the linker accepts -T])
+		OLDLDFLAGS=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Xlinker -T -Xlinker 10000000"
+		AC_TRY_LINK(,,ac_link_mips_t=yes,ac_link_mips_t=no)
+		test $ac_link_mips_t = yes||LDFLAGS=$OLDLDFLAGS
+		AC_MSG_RESULT($ac_link_mips_t)
+		test $ac_link_mips_t = yes||(echo cannot link text and data into same 256M region, using indirect threading; AC_DEFINE(INDIRECT_THREADED))
 		AC_MSG_CHECKING([whether the linker accepts -D])
 		OLDLDFLAGS=$LDFLAGS
-		LDFLAGS="$LDFLAGS -Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
+		LDFLAGS="$LDFLAGS -Xlinker -D -Xlinker 10400000"
 		AC_TRY_LINK(,,ac_link_mips_d=yes,ac_link_mips_d=no)
-		test $ac_link_mips_d = yes||LDFLAGS="$OLDLDFLAGS -Xlinker -T -Xlinker 10000000"
+		test $ac_link_mips_d = yes||LDFLAGS=$OLDLDFLAGS
 		AC_MSG_RESULT($ac_link_mips_d)
 		;;
 	alpha*)
 		machine=alpha
+		#full IEEE FP support for more uniformity across platforms:
+		CFLAGS="$CFLAGS -mieee"
 		;;
 	power*)
 		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; please contact us (bug-gforth@gnu.org)]); AC_DEFINE(INDIRECT_THREADED))
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -230,6 +274,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"
@@ -298,13 +348,19 @@ 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
 
 kernel_fi=kernl${wordsize}${bytesex}.fi
 AC_SUBST(kernel_fi)
 
+dnl replace srource directory by absolute value
+if test $srcdir = "."; then srcdir=`pwd` 
+fi
+
 AC_SUBST(machine)
 dnl AC_LINK_FILES(arch/$machine,arch/machine) #no longer needed
 AC_OUTPUT([