--- gforth/configure.in	1995/12/26 17:35:35	1.18
+++ gforth/configure.in	1996/10/03 16:05:34	1.24
@@ -1,4 +1,23 @@
 dnl Process this file with autoconf to produce a configure script.
+
+#Copyright (C) 1995,1996 Free Software Foundation, Inc.
+
+#This file is part of Gforth.
+
+#Gforth is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.#See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#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)
 
@@ -59,15 +78,62 @@ case "$ac_cv_sizeof_char_p" in
     ;;
   8)
     wordsize=64
-dnl    AC_CHECK_SIZEOF(long long)
-dnl    if [ $ac_cv_sizeof_long_long != 16 ]
-dnl    then
-dnl       try the whole thing with -mlonglong128
-dnl complain about C compiler and OS vendor
-dnl    fi
     ;;
 esac
 
+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_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
 #gforth will run; the system on which configure will run is the `build'
 AC_CANONICAL_HOST
@@ -94,12 +160,10 @@ case "$host_cpu" in
 		;;
 	alpha*)
 		mach_h=alpha
-		echo Very Preliminary Support for Alpha!!!
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
-		echo "Using a generic machine description. It will only work if char * AND"
-		echo "long values have the same size and long long is twice as long."
+		echo "Using a generic machine description."
 		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!"
@@ -112,6 +176,10 @@ dnl Now a little support for DOS/DJGCC
 AC_SUBST(MAKE_EXE)
 MAKE_EXE=""
 
+PATHSEP=":"
+AC_SUBST(PATHSEP)
+AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP')
+
 dnl copy commands for systems that don't have links
 AC_SUBST(LINK_KERNL16L)
 LINK_KERNL16L=""
@@ -130,19 +198,19 @@ LINK_KERNL64B=""
 #then
 #  echo Configuring for DOS!!!
 #  MAKE_EXE="coff2exe gforth"
-#  LINK_KERNL32L='$(CP) kernl32l.fi kernal.fi'
+#  LINK_KERNL32L='$(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.
@@ -156,16 +224,7 @@ AC_CHECK_LIB(m,asin)
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal)
 AC_CHECK_FUNCS(sys_siglist)
-AC_MSG_CHECKING(whether sys_siglist may be declared)
-AC_CACHE_VAL(gf_cv_declare_sys_siglist,
-AC_TRY_COMPILE(#include <stdio.h>
-#include <signal.h>
-,extern void sys_siglist;,gf_cv_declare_sys_siglist='yes',gf_cv_declare_sys_siglist='no'))
-if test $gf_cv_declare_sys_siglist = yes
-then
-  AC_DEFINE(DECLARE_SYS_SIGLIST)
-fi
-AC_MSG_RESULT($gf_cv_declare_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_FUNCS(rint expm1 log1p)
@@ -173,9 +232,9 @@ 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)
+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)