--- gforth/configure.in	1995/12/11 13:15:20	1.15
+++ gforth/configure.in	1996/02/19 18:57:25	1.21
@@ -1,5 +1,25 @@
 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)
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -27,6 +47,8 @@ AC_ARG_WITH(debug,
                     debugging informations.],
 if test "$withval" = "yes"; then DEBUGFLAG=-g; fi)
 
+CFLAGS=$CFLAGS
+
 AC_PROG_CC
 
 if test "$GCC" = "yes"
@@ -34,9 +56,9 @@ then
    echo "Fine, gcc is available"
 else
    cat <<'EOF'
-Gforth uses the GNU-C extensions for better performance. It does not work
-with other C compilers. Please install a new version of the GNU-C compiler, and
-try again.
+Gforth requires GCC-2.0 or higher (it uses GNU C extensions).
+It does not work with other C compilers. Please install the GNU C compiler,
+and try again (or search for a binary distribution for your platform).
 EOF
    exit 1
 fi
@@ -56,22 +78,32 @@ 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_INT_TYPE(sizeof(char *),cell,long)
+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
+	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)
+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
 case "$host_cpu" in
 	hppa*)
 		mach_h=hppa
-		LIBOBJS="cache.o"
+		LIBOBJS="$LIBOBJS cache.o"
 		LDFLAGS="-Xlinker -N"
 		LIBS="-L/lib/pa1.1/"
 		;;
@@ -80,13 +112,10 @@ case "$host_cpu" in
 		;;
 	i386|i486|i586)
 		mach_h=386
-		CFLAGS="-fomit-frame-pointer -fforce-addr -fforce-mem"
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
 		#!! direct/indirect threading switch
 		#!! -m486 flag
 		;;
-	m68*)
-		mach_h=m68k
-		;;
 	mips*)
 		mach_h=mips
 		#link text and data segment into the same 256M region!
@@ -94,14 +123,13 @@ 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 32-bit machine description. It will only work if char * AND"
-		echo "long values have 32 bits."
+		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!"
 		mach_h=32bit
 esac
 AC_SUBST(host)
@@ -154,6 +182,8 @@ dnl using sin here is no good idea since
 AC_CHECK_LIB(m,asin)
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal)
+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_FUNCS(rint expm1 log1p)
@@ -165,5 +195,5 @@ 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)
+AC_OUTPUT(Makefile,echo timestamp > stamp-h)