--- gforth/configure.in	1995/01/19 17:47:58	1.6
+++ gforth/configure.in	1995/12/11 13:15:20	1.15
@@ -20,6 +20,51 @@ AC_ARG_ENABLE(indirect-threaded,
 				(default processor-dependent)],
 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.],
+if test "$withval" = "yes"; then DEBUGFLAG=-g; fi)
+
+AC_PROG_CC
+
+if test "$GCC" = "yes"
+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.
+EOF
+   exit 1
+fi
+
+AC_SUBST(CC)
+AC_SUBST(GCCLDFLAGS)
+AC_SUBST(DEBUGFLAG)
+
+dnl the following macro produces a warning with autoconf-2.1
+AC_CHECK_SIZEOF(char *)
+case "$ac_cv_sizeof_char_p" in
+  2)
+    wordsize=16
+    ;;
+  4)
+    wordsize=32
+    ;;
+  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
+
 #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
@@ -35,6 +80,7 @@ case "$host_cpu" in
 		;;
 	i386|i486|i586)
 		mach_h=386
+		CFLAGS="-fomit-frame-pointer -fforce-addr -fforce-mem"
 		#!! direct/indirect threading switch
 		#!! -m486 flag
 		;;
@@ -43,9 +89,12 @@ case "$host_cpu" in
 		;;
 	mips*)
 		mach_h=mips
-		LDFLAGS="-Xlinker -N"
-		#!! link text and data segment into the same 256M region!
-		#!! does cacheflush work on OSs other than Ultrix?
+		#link text and data segment into the same 256M region!
+		GCCLDFLAGS="-Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
+		;;
+	alpha*)
+		mach_h=alpha
+		echo Very Preliminary Support for Alpha!!!
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -55,6 +104,8 @@ case "$host_cpu" in
 		echo "double numbers. If this is not so, SF@ etc. will not work correctly."
 		mach_h=32bit
 esac
+AC_SUBST(host)
+AC_SUBST(ENGINE_FLAGS)
 
 dnl Now a little support for DOS/DJGCC
 AC_SUBST(MAKE_EXE)
@@ -78,7 +129,7 @@ LINK_KERNL64B=""
 #then
 #  echo Configuring for DOS!!!
 #  MAKE_EXE="coff2exe gforth"
-#  LINK_KERNL32L='$(CP) kernl32l.fi gforth.fi'
+#  LINK_KERNL32L='$(CP) kernl32l.fi kernal.fi'
 #fi
 
 dnl the following macro produces a warning with autoconf-2.1
@@ -102,15 +153,17 @@ 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)
-AC_CHECK_FUNC(getopt_long,getop_long="",getopt_long="getopt.o getopt1.o")
+AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal)
+AC_CHECK_FUNC(getopt_long,getopt_long="",getopt_long="getopt.o getopt1.o")
 AC_SUBST(getopt_long)
-AC_CHECK_FUNCS(rint expm1 log1p pow10)
+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
 
-dnl autoconf requires (implicitly) that AC_LINK_FILES is used only once
-AC_LINK_FILES(${mach_h}.h kernl32${bytesex}.fi,machine.h gforth.fi)
+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)