--- gforth/configure.in	1994/12/12 17:10:33	1.1
+++ gforth/configure.in	1995/01/25 18:53:45	1.8
@@ -20,12 +20,17 @@ AC_ARG_ENABLE(indirect-threaded,
 				(default processor-dependent)],
 AC_DEFINE(INDIRECT_THREADED))
 
+AC_SUBST(GCCLDFLAGS)
+
 #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
 case "$host_cpu" in
 	hppa*)
 		mach_h=hppa
+		LIBOBJS="cache.o"
+		LDFLAGS="-Xlinker -N"
+		LIBS="-L/lib/pa1.1/"
 		;;
 	sparc*)
 		mach_h=sparc
@@ -40,8 +45,10 @@ case "$host_cpu" in
 		;;
 	mips*)
 		mach_h=mips
-		#!! link text and data segment into the same 256M region!
-		#!! does cacheflush work on OSs other than Ultrix?
+		#link text and data segment into the same 256M region!
+		GCCLDFLAGS="-Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
+		#this works on Ultrix, but not on Irix
+		#for now use indirect threading under Irix
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -57,10 +64,18 @@ AC_SUBST(MAKE_EXE)
 MAKE_EXE=""
 
 dnl copy commands for systems that don't have links
+AC_SUBST(LINK_KERNL16L)
+LINK_KERNL16L=""
+AC_SUBST(LINK_KERNL16B)
+LINK_KERNL16B=""
 AC_SUBST(LINK_KERNL32L)
 LINK_KERNL32L=""
 AC_SUBST(LINK_KERNL32B)
 LINK_KERNL32B=""
+AC_SUBST(LINK_KERNL64L)
+LINK_KERNL64L=""
+AC_SUBST(LINK_KERNL64B)
+LINK_KERNL64B=""
 
 #if test $host_os=dos
 #then
@@ -71,11 +86,14 @@ LINK_KERNL32B=""
 
 dnl the following macro produces a warning with autoconf-2.1
 AC_C_BIGENDIAN
+AC_SUBST(KERNAL)
 dnl ac_cv_c_bigendian is an undocumented variable of autoconf-2.1
 if test $ac_cv_c_bigendian = yes; then
   bytesex=b
+  KERNAL="kernl16b.fi kernl16l.fi kernl32b.fi kernl32l.fi kernl64b.fi kernl64l.fi"
 else
   bytesex=l
+  KERNAL="kernl16l.fi kernl16b.fi kernl32l.fi kernl32b.fi kernl64l.fi kernl64b.fi"
 fi
 
 dnl Checks for programs.
@@ -83,18 +101,22 @@ AC_PROG_LN_S
 AC_PROG_INSTALL
 
 dnl Checks for library functions
+dnl This check is just for making later checks link with libm.
+dnl using sin here is no good idea since it is built-into gcc and typechecked
+AC_CHECK_LIB(m,asin)
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(memmove strtoul)
-AC_CHECK_FUNC(getopt_long,getop_long="",getopt_long="getopt.o getopt1.o")
+AC_CHECK_FUNC(getopt_long,getopt_long="",getopt_long="getopt.o getopt1.o")
 AC_SUBST(getopt_long)
-dnl This check is just for making later checks link with libm.
-AC_CHECK_LIB(m,sin)
-AC_CHECK_FUNCS(rint)
+AC_CHECK_FUNCS(rint expm1 log1p pow10)
 AC_REPLACE_FUNCS(ecvt)
 dnl No check for select, because our replacement is no good under
 dnl anything but DOS
 
+gforth_fi=kernl32${bytesex}.fi
+AC_SUBST(gforth_fi)
+
 dnl autoconf requires (implicitly) that AC_LINK_FILES is used only once
-AC_LINK_FILES(${mach_h}.h kernl32${bytesex}.fi,machine.h gforth.fi)
+AC_LINK_FILES(${mach_h}.h $gforth_fi,machine.h gforth.fi)
 AC_OUTPUT(Makefile)