--- gforth/configure.in	1996/02/13 11:12:15	1.20
+++ gforth/configure.in	1997/03/25 23:27:12	1.30
@@ -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
@@ -81,20 +81,57 @@ 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(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_short)
+    ac_cv_int_type_cell=short
+    ;;
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_cell=int
+    ;;
+  $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
@@ -116,6 +153,10 @@ case "$host_cpu" in
 		#!! direct/indirect threading switch
 		#!! -m486 flag
 		;;
+        m68k)
+		mach_h=m68k
+		CFLAGS="$CFLAGS -fomit-frame-pointer -traditional-cpp"
+		;;
 	mips*)
 		mach_h=mips
 		#link text and data segment into the same 256M region!
@@ -136,40 +177,38 @@ 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 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.
@@ -181,7 +220,7 @@ dnl This check is just for making later
 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_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")
@@ -190,10 +229,12 @@ 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)
 
-kernal_fi=kernl${wordsize}${bytesex}.fi
-AC_SUBST(kernal_fi)
+kernel_fi=kernl${wordsize}${bytesex}.fi
+AC_SUBST(kernel_fi)
 
-AC_LINK_FILES(${mach_h}.h $kernal_fi,machine.h kernal.fi)
+AC_LINK_FILES(${mach_h}.h $kernel_fi,machine.h kernel.fi)
 AC_OUTPUT(Makefile,echo timestamp > stamp-h)