--- gforth/configure.in	1995/02/02 18:13:01	1.9
+++ gforth/configure.in	1995/04/29 16:51:49	1.12
@@ -21,7 +21,7 @@ AC_ARG_ENABLE(indirect-threaded,
 AC_DEFINE(INDIRECT_THREADED))
 
 AC_ARG_WITH(debug,
-[  --with-debug     specifys option -g to compile with debug info (default)
+[  --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.],
@@ -31,7 +31,25 @@ if test "$withval" = "yes"; then DEBUGFL
 AC_SUBST(GCCLDFLAGS)
 AC_SUBST(DEBUGFLAG)
 
-wordsize=32
+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'
@@ -59,12 +77,9 @@ 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
-		wordsize=64
 		echo Very Preliminary Support for Alpha!!!
 		;;
 	*)
@@ -75,6 +90,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)
@@ -122,10 +138,10 @@ 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)
 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