--- gforth/configure.in	1996/02/13 11:12:15	1.20
+++ gforth/configure.in	1998/10/25 23:15:45	1.40
@@ -18,8 +18,13 @@ 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)
+
+dnl We use some automake macros here,
+dnl but don't use automake for creating Makefile.in
+AM_INIT_AUTOMAKE(gforth,0.4.0)
+AM_CONFIG_HEADER(engine/config.h)
+AM_CYGWIN32
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -42,9 +47,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
@@ -64,7 +69,6 @@ EOF
 fi
 
 AC_SUBST(CC)
-AC_SUBST(GCCLDFLAGS)
 AC_SUBST(DEBUGFLAG)
 
 dnl the following macro produces a warning with autoconf-2.1
@@ -81,20 +85,61 @@ case "$ac_cv_sizeof_char_p" in
     ;;
 esac
 
-AC_CHECK_INT_TYPE(sizeof(char *),cell,long)
-if test $ac_cv_int_type_cell != int; then
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+
+ac_cv_int_type_cell=none
+case "$ac_cv_sizeof_char_p" in
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_cell=int
+    ;;
+  $ac_cv_sizeof_short)
+    ac_cv_int_type_cell=short
+    ;;
+  $ac_cv_sizeof_char)
+    ac_cv_int_type_cell=char
+    ;;
+  $ac_cv_sizeof_long)
+    ac_cv_int_type_cell=long
+    ;;
+  $ac_cv_sizeof_long_long)
+    ac_cv_int_type_cell="long long"
+    ;;
+esac
+if test "$ac_cv_int_type_cell" != int; then
 	echo "So, sizeof(pointer)!=sizeof(int); looks like a DOS C compiler to me."
 	echo "Since you don't have a proper C on this machine, that's one more reason"
 	echo "to use Forth;-)"
 fi
-AC_CHECK_INT_TYPE(2*sizeof(char *),double cell,long long)
-if test $ac_cv_int_type_double_cell = none; then
+AC_DEFINE_UNQUOTED(CELL_TYPE,$ac_cv_int_type_cell)
+
+ac_cv_int_type_double_cell=none
+case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
+  $ac_cv_sizeof_short)
+    ac_cv_int_type_double_cell=short
+    ;;
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_double_cell=int
+    ;;
+  $ac_cv_sizeof_long)
+    ac_cv_int_type_double_cell=long
+    ;;
+  $ac_cv_sizeof_long_long)
+    ac_cv_int_type_double_cell="long long"
+    ;;
+esac
+if test "$ac_cv_int_type_double_cell" = none; then
 	echo "Emulating double-cell arithmetic. This may be slow."
 	echo "If you find this unacceptable, ask the GCC maintainers to provide proper"
 	echo 'long longs for your machine (the GCC manual states that they \"are twice as'
 	echo "long as \`long int\'\")."
 	LIBOBJS="$LIBOBJS dblsub.o"
 	AC_DEFINE(BUGGY_LONG_LONG)
+else
+  AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell)
 fi
 
 #terminology is a bit unusual here: The host is the system on which
@@ -102,27 +147,72 @@ fi
 AC_CANONICAL_HOST
 case "$host_cpu" in
 	hppa*)
-		mach_h=hppa
-		LIBOBJS="cache.o"
+		machine=hppa
+		LIBOBJS="$LIBOBJS ../arch/hppa/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
+		machine=sparc
 		;;
-	i386|i486|i586)
-		mach_h=386
+	i386)
+		machine=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 code on 386"
+			AC_DEFINE(DIRECT_THREADED)
+		fi
+		;;
+	i486)
+		machine=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 code on 486"
+			AC_DEFINE(DIRECT_THREADED)
+		fi
+		;;
+	i586|i686)
+		machine=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 code on Pentium and up"
+			AC_DEFINE(INDIRECT_THREADED)
+		fi
+		;;
+        m68k)
+		machine=m68k
+		CFLAGS="$CFLAGS -fomit-frame-pointer"
+		if test "$host_os" = "nextstep3"
+		then
+			LIBOBJS="$LIBOBJS termios.o"
+		fi
 		;;
 	mips*)
-		mach_h=mips
+		machine=mips
 		#link text and data segment into the same 256M region!
-		GCCLDFLAGS="-Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
+		AC_MSG_CHECKING([whether the linker accepts -D])
+		OLDLDFLAGS=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Xlinker -T -Xlinker 10000000 -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"
+		AC_MSG_RESULT($ac_link_mips_d)
 		;;
 	alpha*)
-		mach_h=alpha
+		machine=alpha
+		;;
+	power*)
+		machine=power
+		AC_CHECK_FUNC(_sync_cache_range,true,LIBOBJS="$LIBOBJS ../arch/power/_sync_cache_range.o")
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -130,70 +220,89 @@ case "$host_cpu" in
 		echo "I'll assume that C floats and doubles are represented by IEEE single and"
 		echo "double numbers. If this is not so, SF@ etc. will not work correctly."
 		echo "FLUSH-ICACHE will do nothing, so END-CODE may not work properly!"
-		mach_h=32bit
+		machine=generic
 esac
 AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
 
+case "$host_os" in
+	*win32)
+		EXE=".exe"
+		;;
+	*)
+		EXE=""
+		;;
+esac
+AC_SUBST(EXE)
+
 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 kernal.fi'
+#  LINK_KERNL='$(CP) kernl32l.fi kernel.fi'
 #fi
 
 dnl the following macro produces a warning with autoconf-2.1
 AC_C_BIGENDIAN
-AC_SUBST(KERNAL)
+AC_SUBST(KERNEL)
 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"
+  KERNEL="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"
+  KERNEL="kernl16l.fi kernl16b.fi kernl32l.fi kernl32b.fi kernl64l.fi kernl64b.fi"
 fi
 
 dnl Checks for programs.
 AC_PROG_LN_S
-AC_PROG_INSTALL
+dnl AM_PROG_INSTALL #performed by AM_INIT_AUTOMAKE
 
 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 pow10 strerror strsignal)
+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
-AC_CHECK_FUNC(getopt_long,getopt_long="",getopt_long="getopt.o getopt1.o")
-AC_SUBST(getopt_long)
+AC_CHECK_FUNC(getopt_long,true,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
 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
-
-kernal_fi=kernl${wordsize}${bytesex}.fi
-AC_SUBST(kernal_fi)
-
-AC_LINK_FILES(${mach_h}.h $kernal_fi,machine.h kernal.fi)
-AC_OUTPUT(Makefile,echo timestamp > stamp-h)
-
+AC_CHECK_HEADERS(sys/mman.h)
+AC_CHECK_FUNCS(mmap sysconf getpagesize)
+AM_PATH_LISPDIR
+
+kernel_fi=kernl${wordsize}${bytesex}.fi
+AC_SUBST(kernel_fi)
+
+AC_SUBST(machine)
+dnl AC_LINK_FILES(arch/$machine,arch/machine) #no longer needed
+AC_OUTPUT([
+Makefile
+engine/Makefile
+doc/version.texi ],echo timestamp > stamp-h)