--- gforth/configure.in	1996/10/13 19:56:20	1.26
+++ gforth/configure.in	1997/06/15 19:43:27	1.32
@@ -18,8 +18,8 @@ dnl Process this file with autoconf to p
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_INIT(engine.c)
-AC_CONFIG_HEADER(config.h)
+AC_INIT(engine/engine.c)
+AC_CONFIG_HEADER(engine/config.h)
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -42,9 +42,9 @@ AC_DEFINE(INDIRECT_THREADED))
 
 AC_ARG_WITH(debug,
 [  --with-debug     specifies option -g to compile with debug info (default)
-   --without-debug  omits the -g switch and creates smaller images on
-                    machines where "strip" has problems with gcc style
-                    debugging informations.],
+  --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)
 
 CFLAGS=$CFLAGS
@@ -143,19 +143,51 @@ case "$host_cpu" in
 		LIBOBJS="cache.o"
 		LDFLAGS="-Xlinker -N"
 		LIBS="-L/lib/pa1.1/"
+		if test "${enable_direct_threaded+set}" = ""
+		then
+			AC_DEFINE(DIRECT_THREADED)
+		fi
 		;;
 	sparc*)
 		mach_h=sparc
 		;;
-	i386|i486|i586)
+	i386)
 		mach_h=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
-		#!! direct/indirect threading switch
-		#!! -m486 flag
+		if test "${enable_direct_threaded+set}" = "" \
+			-a "${enable_indirect_threaded+set}" = ""
+		then
+			echo "Using direct threaded on 386er"
+			AC_DEFINE(DIRECT_THREADED)
+		fi
+		;;
+	i486)
+		mach_h=386
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486"
+		if test "${enable_direct_threaded+set}" = "" \
+			-a "${enable_indirect_threaded+set}" = ""
+		then
+			echo "Using direct threaded on 486er"
+			AC_DEFINE(DIRECT_THREADED)
+		fi
+		;;
+	i586|i686)
+		mach_h=386
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486"
+		if test "${enable_direct_threaded+set}" = "" \
+			-a "${enable_indirect_threaded+set}" = ""
+		then
+			echo "Using indirect threaded on Pentium and up"
+			AC_DEFINE(INDIRECT_THREADED)
+		fi
 		;;
         m68k)
 		mach_h=m68k
-		CFLAGS="$CFLAGS -fomit-frame-pointer -traditional-cpp"
+		CFLAGS="$CFLAGS -fomit-frame-pointer"
+		if test "$host_os" = "nextstep3"
+		then
+			LIBOBJS="$LIBOBJS termios.o"
+		fi
 		;;
 	mips*)
 		mach_h=mips
@@ -165,6 +197,9 @@ case "$host_cpu" in
 	alpha*)
 		mach_h=alpha
 		;;
+	power*)
+		mach_h=power
+		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
 		echo "Using a generic machine description."
@@ -177,32 +212,26 @@ AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
 
 dnl Now a little support for DOS/DJGCC
-AC_SUBST(MAKE_EXE)
-MAKE_EXE=""
+AC_SUBST(GFORTH_EXE)
+GFORTH_EXE=""
+AC_SUBST(GFORTHDITC_EXE)
+GFORTHDITC_EXE=""
 
 PATHSEP=":"
 AC_SUBST(PATHSEP)
 AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP')
 
+AC_SUBST(FORTHSIZES)
+
 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=""
+AC_SUBST(LINK_KERNL)
+LINK_KERNL=""
 
 #if test $host_os=dos
 #then
 #  echo Configuring for DOS!!!
 #  MAKE_EXE="coff2exe gforth"
-#  LINK_KERNL32L='$(CP) kernl32l.fi kernel.fi'
+#  LINK_KERNL='$(CP) kernl32l.fi kernel.fi'
 #fi
 
 dnl the following macro produces a warning with autoconf-2.1
@@ -225,7 +254,13 @@ 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_CHECK_FUNCS(dlopen)
+AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(kernel32,GetModuleHandle)
+if test "$host_os" != "nextstep3"
+then
+	AC_FUNC_MEMCMP
+fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)
 AC_CHECK_FUNCS(sys_siglist)
 AC_DECL_SYS_SIGLIST
@@ -235,10 +270,14 @@ 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_FUNCS(mmap sysconf getpagesize)
 
 kernel_fi=kernl${wordsize}${bytesex}.fi
 AC_SUBST(kernel_fi)
 
-AC_LINK_FILES(${mach_h}.h $kernel_fi,machine.h kernel.fi)
-AC_OUTPUT(Makefile,echo timestamp > stamp-h)
+AC_LINK_FILES(arch/${mach_h} $kernel_fi,machine kernel.fi)
+AC_OUTPUT([
+Makefile
+engine/Makefile ],echo timestamp > stamp-h)