--- gforth/configure.in	1995/01/25 18:53:45	1.8
+++ gforth/configure.in	1995/11/29 20:20:33	1.14
@@ -1,6 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.
+
 AC_INIT(engine.c)
 
+GCC=${GCC-gcc}
+AC_SUBST(GCC)
+
+dnl configure needs $CC to find out some parameters, and there may be
+dnl differences in what is obtained from gcc and from the default cc.
+dnl Therefore, we define $CC to be gcc:
+CC=$GCC
+
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
 			  the machine.h file. This can cause a good speedup,
@@ -20,7 +29,36 @@ 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_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 -mlonlong128
+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'
@@ -37,6 +75,7 @@ case "$host_cpu" in
 		;;
 	i386|i486|i586)
 		mach_h=386
+		CFLAGS="-fforce-mem -fforce-addr -fomit-frame-pointer"
 		#!! direct/indirect threading switch
 		#!! -m486 flag
 		;;
@@ -47,8 +86,10 @@ case "$host_cpu" in
 		mach_h=mips
 		#link text and data segment into the same 256M region!
 		GCCLDFLAGS="-Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
-		#this works on Ultrix, but not on Irix
-		#for now use indirect threading under Irix
+		;;
+	alpha*)
+		mach_h=alpha
+		echo Very Preliminary Support for Alpha!!!
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -58,6 +99,7 @@ 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)
 
 dnl Now a little support for DOS/DJGCC
 AC_SUBST(MAKE_EXE)
@@ -81,7 +123,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
@@ -105,18 +147,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_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
 
-gforth_fi=kernl32${bytesex}.fi
-AC_SUBST(gforth_fi)
+kernal_fi=kernl${wordsize}${bytesex}.fi
+AC_SUBST(kernal_fi)
 
-dnl autoconf requires (implicitly) that AC_LINK_FILES is used only once
-AC_LINK_FILES(${mach_h}.h $gforth_fi,machine.h gforth.fi)
+AC_LINK_FILES(${mach_h}.h $kernal_fi,machine.h kernal.fi)
 AC_OUTPUT(Makefile)