--- gforth/configure.in	1997/09/01 23:07:06	1.33
+++ gforth/configure.in	1998/06/04 16:17:38	1.34
@@ -19,7 +19,12 @@ dnl Process this file with autoconf to p
 #Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 AC_INIT(engine/engine.c)
-AC_CONFIG_HEADER(engine/config.h)
+
+dnl We use some automake macros here,
+dnl but don't use automake for creating Makefile.in
+AM_INIT_AUTOMAKE(gforth,0.4.0)
+AM_CONFIG_HEADER(engine/config.h)
+AM_CYGWIN32
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -139,8 +144,8 @@ fi
 AC_CANONICAL_HOST
 case "$host_cpu" in
 	hppa*)
-		mach_h=hppa
-		LIBOBJS="cache.o"
+		machine=hppa
+		LIBOBJS="$LIBOBJS cache.o"
 		LDFLAGS="-Xlinker -N"
 		LIBS="-L/lib/pa1.1/"
 		if test "${enable_direct_threaded+set}" = ""
@@ -149,40 +154,40 @@ case "$host_cpu" in
 		fi
 		;;
 	sparc*)
-		mach_h=sparc
+		machine=sparc
 		;;
 	i386)
-		mach_h=386
+		machine=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem"
 		if test "${enable_direct_threaded+set}" = "" \
 			-a "${enable_indirect_threaded+set}" = ""
 		then
-			echo "Using direct threaded on 386er"
+			echo "Using direct threaded code on 386"
 			AC_DEFINE(DIRECT_THREADED)
 		fi
 		;;
 	i486)
-		mach_h=386
+		machine=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486"
 		if test "${enable_direct_threaded+set}" = "" \
 			-a "${enable_indirect_threaded+set}" = ""
 		then
-			echo "Using direct threaded on 486er"
+			echo "Using direct threaded code on 486"
 			AC_DEFINE(DIRECT_THREADED)
 		fi
 		;;
 	i586|i686)
-		mach_h=386
+		machine=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486"
 		if test "${enable_direct_threaded+set}" = "" \
 			-a "${enable_indirect_threaded+set}" = ""
 		then
-			echo "Using indirect threaded on Pentium and up"
+			echo "Using indirect threaded code on Pentium and up"
 			AC_DEFINE(INDIRECT_THREADED)
 		fi
 		;;
         m68k)
-		mach_h=m68k
+		machine=m68k
 		CFLAGS="$CFLAGS -fomit-frame-pointer"
 		if test "$host_os" = "nextstep3"
 		then
@@ -190,15 +195,15 @@ case "$host_cpu" in
 		fi
 		;;
 	mips*)
-		mach_h=mips
+		machine=mips
 		#link text and data segment into the same 256M region!
 		GCCLDFLAGS="-Xlinker -T -Xlinker 10000000 -Xlinker -D -Xlinker 10400000"
 		;;
 	alpha*)
-		mach_h=alpha
+		machine=alpha
 		;;
 	power*)
-		mach_h=power
+		machine=power
 		;;
 	*)
 		echo "No direct threading support for $host_cpu, using indirect threading."
@@ -206,7 +211,7 @@ case "$host_cpu" in
 		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
+		machine=generic
 esac
 AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
@@ -248,7 +253,7 @@ fi
 
 dnl Checks for programs.
 AC_PROG_LN_S
-AC_PROG_INSTALL
+dnl AM_PROG_INSTALL #performed by AM_INIT_AUTOMAKE
 
 dnl Checks for library functions
 dnl This check is just for making later checks link with libm.
@@ -264,20 +269,20 @@ fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)
 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_FUNC(getopt_long,true,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
 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
 AC_CHECK_HEADERS(sys/mman.h)
 AC_CHECK_FUNCS(mmap sysconf getpagesize)
+AM_PATH_LISPDIR
 
 kernel_fi=kernl${wordsize}${bytesex}.fi
 AC_SUBST(kernel_fi)
 
-AC_SUBST(mach_h)
-AC_LINK_FILES($kernel_fi,kernel.fi)
+AC_SUBST(machine)
+dnl AC_LINK_FILES(arch/$machine,arch/machine) #no longer needed
 AC_OUTPUT([
 Makefile
 engine/Makefile ],echo timestamp > stamp-h)