--- gforth/configure.in	2002/12/23 22:14:05	1.91
+++ gforth/configure.in	2003/01/18 22:00:21	1.100
@@ -18,18 +18,18 @@ dnl Process this file with autoconf to p
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
-AC_INIT(engine/engine.c)
-
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AM_INIT_AUTOMAKE(gforth,0.5.9-20020901)
+AC_INIT([gforth],[0.5.9-20021227],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
 #snapshots have numbers major.minor.release-YYYYMMDD
-#note that lexicographic ordering bust be heeded.
+#note that lexicographic ordering must be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
-UPDATED="1 September 2002"
+UPDATED="27 December 2002"
 AC_SUBST(UPDATED)
-AM_CONFIG_HEADER(engine/config.h)
-#AM_CYGWIN32
+AC_CONFIG_HEADERS(engine/config.h)
+
+#default setting that may be changed later:
+no_dynamic_default=0
 
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
@@ -52,6 +52,21 @@ AC_ARG_WITH(peephole,
 			but slower images.],
 PEEPHOLE="$withval")
 
+#set up feature test macros, so the tests get them right:
+# turn on all POSIX, SUSv3, and GNU features if available
+AC_GNU_SOURCE
+dnl AC_DEFINE_UNQUOTED([_GNU_SOURCE],1,[feature test macro])
+
+dnl Don't define _POSIX_SOURCE etc. because some OSs (in particular
+dnl MacOSX) disable some features then (MacOSX checks for _POSIX_SOURCE,
+dnl but not for _XOPEN_SOURCE)
+dnl AC_DEFINE_UNQUOTED([_POSIX_SOURCE],1,[feature test macro])
+dnl AC_DEFINE_UNQUOTED([_POSIX_C_SOURCE],199506L,[feature test macro])
+dnl AC_DEFINE_UNQUOTED([_XOPEN_SOURCE],600,[feature test macro])
+# turn on large file support with 64-bit off_t where available
+AC_DEFINE_UNQUOTED([_LARGEFILE_SOURCE],1,[feature test macro])
+AC_DEFINE_UNQUOTED([_FILE_OFFSET_BITS],64,[feature test macro])
+
 #currently we force direct threading this way.  Eventually we should
 #setup in the arch and engine files right
 
@@ -59,21 +74,21 @@ CFLAGS=$CFLAGS
 
 AC_PROG_CC
 
-if test "$GCC" = "yes"
-then
-   echo "Fine, gcc is available"
-else
-   cat <<'EOF'
-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
+test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher)
 
 AC_SUBST(CC)
 AC_SUBST(DEBUGFLAG)
 
+dnl gcc-3.2 seems to work fine now
+dnl AC_MSG_CHECKING(gcc version)
+dnl gcc_version=`$CC -v 2>&1|grep 'gcc version'|sed 's/.*gcc version //'`
+dnl AC_MSG_RESULT($gcc_version)
+dnl if expr "$gcc_version" \> 3.0.4 >/dev/null && expr "$gcc_version" \< 3.2.1 >/dev/null
+dnl then
+dnl    no_dynamic_default=1
+dnl    AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
+dnl fi
+
 dnl the following macro produces a warning with autoconf-2.1
 AC_CHECK_SIZEOF(char *)
 case "$ac_cv_sizeof_char_p" in
@@ -93,7 +108,10 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(intptr_t)
+AC_CHECK_SIZEOF(int128_t)
 
+AC_MSG_CHECKING([for a C type for cells])
 ac_cv_int_type_cell=none
 case "$ac_cv_sizeof_char_p" in
   $ac_cv_sizeof_int)
@@ -111,14 +129,17 @@ case "$ac_cv_sizeof_char_p" in
   $ac_cv_sizeof_long_long)
     ac_cv_int_type_cell="long long"
     ;;
+  $ac_cv_sizeof_intptr_t)
+    ac_cv_int_type_cell="intptr_t"
+    ;;
+  $ac_cv_sizeof_int128_t)
+    ac_cv_int_type_cell="int128_t"
+    ;;
 esac
-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_MSG_RESULT($ac_cv_int_type_cell)
 AC_DEFINE_UNQUOTED(CELL_TYPE,$ac_cv_int_type_cell,[an integer type that is as long as a pointer])
 
+AC_MSG_CHECKING([for a C type for double-cells])
 ac_cv_int_type_double_cell=none
 case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
   $ac_cv_sizeof_short)
@@ -133,18 +154,28 @@ case `expr 2 '*' "$ac_cv_sizeof_char_p"`
   $ac_cv_sizeof_long_long)
     ac_cv_int_type_double_cell="long long"
     ;;
+  $ac_cv_sizeof_intptr_t)
+    ac_cv_int_type_double_cell="intptr_t"
+    ;;
+  $ac_cv_sizeof_int128_t)
+    ac_cv_int_type_double_cell="int128_t"
+    ;;
 esac
+AC_MSG_RESULT($ac_cv_int_type_double_cell)
 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\'\")."
+	AC_MSG_WARN([Emulating double-cell arithmetic. This may be slow.])
 	AC_LIBOBJ(dblsub)
 	AC_DEFINE(BUGGY_LONG_LONG,,[define this if there is no working DOUBLE_CELL_TYPE on your machine])
 else
-  AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
+	AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
 fi
 
+AC_TYPE_OFF_T
+AC_CHECK_SIZEOF(off_t)
+test $ac_cv_sizeof_off_t -gt $ac_cv_sizeof_char_p
+ac_small_off_t=$?
+AC_DEFINE_UNQUOTED(SMALL_OFF_T,$ac_small_off_t,[1 if off_t fits in a Cell])
+
 AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
 OLDLDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS -export-dynamic"
@@ -183,9 +214,10 @@ case "$host_cpu" in
 		CFLAGS="$CFLAGS -march=pentium"
 		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
 		;;
-	ia64*)
-		machine=ia64
-		;;
+#generic should work for IA64
+#	ia64*)
+#		machine=ia64
+#		;;
         m68k)
 		machine=m68k
 		CFLAGS="$CFLAGS -fomit-frame-pointer"
@@ -196,22 +228,21 @@ case "$host_cpu" in
 		;;
 	mips*)
 		machine=mips
-		#link text and data segment into the same 256M region!
-		AC_MSG_CHECKING([whether the linker accepts -T])
-		OLDLDFLAGS=$LDFLAGS
-		LDFLAGS="$LDFLAGS -Xlinker -T -Xlinker 10000000"
-		AC_TRY_LINK(,,ac_link_mips_t=yes,ac_link_mips_t=no)
-		test $ac_link_mips_t = yes||LDFLAGS=$OLDLDFLAGS
-		AC_MSG_RESULT($ac_link_mips_t)
-		fixme #dynamically generated code should be in the same 256MB
-		# region as the text segment; no indirect threading necessary
-		test $ac_link_mips_t = yes||(echo cannot link text and data into same 256M region, using indirect threading; AC_DEFINE(INDIRECT_THREADED,,[Define if you want to force an indirect threaded code implementation]))
-		AC_MSG_CHECKING([whether the linker accepts -D])
-		OLDLDFLAGS=$LDFLAGS
-		LDFLAGS="$LDFLAGS -Xlinker -D -Xlinker 10400000"
-		AC_TRY_LINK(,,ac_link_mips_d=yes,ac_link_mips_d=no)
-		test $ac_link_mips_d = yes||LDFLAGS=$OLDLDFLAGS
-		AC_MSG_RESULT($ac_link_mips_d)
+		#dynamic native code has the following problems on MIPS:
+		#
+		#1) J/JAL seems relocatable, but is are only
+		#relocatable within a 256MB-segment.  While we try to
+		#get the linker to arrange this, there is no guarantee
+		#that this will succeed (and if the user uses a lot of
+		#memory, it is likely to fail).
+		#
+		#2) The way we generate dynamic native code may
+		#violate MIPS architectural restrictions (in
+		#particular, the delay slots of LW, MFLO, etc.)
+		#
+		#Therefore we disable dynamic native code by default:
+		no_dynamic_default=1
+		AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
 		;;
 	alpha*)
 		machine=alpha
@@ -224,11 +255,13 @@ case "$host_cpu" in
 		AC_CHECK_FUNC(_sync_cache_range,true,AC_LIBOBJ(../arch/power/_sync_cache_range))
 		;;
 	*)
-		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!"
+		AC_MSG_WARN([Using a generic machine description])
+		AC_MSG_WARN([Assuming C floats and doubles are IEEE floats and doubles (for SF@ DF@ SF! DF!)])
+		AC_MSG_WARN([FLUSH-ICACHE will do nothing, so END-CODE may not work properly!])
 		machine=generic
+		#I-cache flushing would be needed for dynamic code generation
+		no_dynamic_default=1
+		AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
 esac
 AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
@@ -250,6 +283,13 @@ case "$host_os" in
 		EXE=".exe"
 		DIRSEP="\\"
 		;;
+	*darwin*)
+		#Darwin uses some funny preprocessor by default; eliminate it:
+		AC_MSG_NOTICE([using -traditional-cpp on Darwin])
+		CFLAGS="$CFLAGS -traditional-cpp"
+		EXE=""
+		DIRSEP="/"
+		;;
 	*)
 		EXE=""
 		DIRSEP="/"
@@ -308,9 +348,10 @@ else
 fi
 
 #check how to do asm(".skip 16")
+AC_MSG_CHECKING([if and how we can waste code space])
+skipcode=no
 for i in ".skip 16" ".block 16" ".org .+16" ".=.+16" ".space 16"
 do
-	AC_MSG_CHECKING([whether asm("$i") skips 16 bytes])
 	AC_TRY_RUN(
 int foo(int);
 main()
@@ -326,17 +367,24 @@ int foo(int x)
   }
   return (&&label2)-(&&label1);
 }
-	,AC_MSG_RESULT(yes)
-         AC_DEFINE_UNQUOTED(SKIP16,asm("$i"),statement for skipping 16 bytes)
-         break
-	,AC_MSG_RESULT(no),)
-	
+	,skipcode=$i; break
+	,,)
 done	
+AC_MSG_RESULT($skipcode)
+if test "$skipcode" = no
+then 
+    no_dynamic_default=1
+    AC_DEFINE_UNQUOTED(SKIP16,((void)0),statement for skipping 16 bytes)
+    AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
+else
+    AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes)
+fi
 
+AC_DEFINE_UNQUOTED(NO_DYNAMIC_DEFAULT,$no_dynamic_default,default value for no_dynamic)
 
 dnl Checks for programs.
 AC_PROG_LN_S
-dnl AM_PROG_INSTALL #performed by AM_INIT_AUTOMAKE
+AC_PROG_INSTALL
 
 dnl Checks for library functions
 dnl This check is just for making later checks link with libm.
@@ -348,9 +396,11 @@ then
 	AC_FUNC_MEMCMP
 fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)
-AC_CHECK_FUNCS(dlopen sys_siglist getrusage)
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage)
+AC_CHECK_TYPES(stack_t)
 AC_DECL_SYS_SIGLIST
-AC_CHECK_FUNC(getopt_long,true,AC_LIBOBJ(getopt.$ac_objext getopt1))
+AC_CHECK_FUNC(getopt_long,true,AC_LIBOBJ(getopt); AC_LIBOBJ(getopt1))
 AC_CHECK_FUNCS(expm1 log1p)
 AC_REPLACE_FUNCS(rint ecvt)
 dnl No check for select, because our replacement is no good under
@@ -370,17 +420,17 @@ AC_SUBST(kernel_fi)
 #fi
 
 AC_SUBST(machine)
-dnl AC_LINK_FILES(arch/$machine,arch/machine) #no longer needed
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 Makedist
 gforthmi
 vmgen
 machpc.fs
 engine/Makefile
-doc/version.texi ],
-echo timestamp > stamp-h
+doc/version.texi ])
+AC_CONFIG_COMMANDS([stamp-h],[[echo timestamp > stamp-h
 chmod +x gforthmi
 chmod +x vmgen
-test -d kernel||mkdir kernel)
+test -d kernel||mkdir kernel]],[[]])
+AC_OUTPUT