--- gforth/configure.in	2008/12/26 17:29:52	1.267
+++ gforth/configure.in	2010/09/13 22:28:08	1.283
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to p
 
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AC_INIT([gforth],[0.7.0-20081226],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.7.0-2010913],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
 AC_PREREQ(2.54)
 #snapshots have numbers major.minor.release-YYYYMMDD
 #note that lexicographic ordering must be heeded.
@@ -70,6 +70,7 @@ if test "$withval" = "yes"; then DEBUGFL
 
 GCC_LD="\$(GCC)"
 EC_MODE="false"
+NO_EC=""
 EC=""
 engine2='engine2$(OPT).o'
 engine_fast2='engine-fast2$(OPT).o'
@@ -77,6 +78,7 @@ no_dynamic=""
 image_i=""
 signals_o="io.o signals.o"
 
+AC_CANONICAL_HOST
 AC_ARG_WITH(ec,
 	AC_HELP_STRING([--with-ec=<arch>],
 			[  Build gforth for systems without OS.]),
@@ -87,6 +89,7 @@ else
   AC_DEFINE(STANDALONE,,[Define if you want a Gforth without OS])
   EC_MODE="true"
   EC="-ec"
+  NO_EC="#"
   engine2=""
   engine_fast2=""
   no_dynamic="-DNO_DYNAMIC"
@@ -96,6 +99,9 @@ else
   else
     signals_o="io.o"
   fi
+  if test -f "arch/$host_cpu/${withval}/config.sh"; then
+    source "arch/$host_cpu/${withval}/config.sh"
+  fi
   GCC_PATH=$(which $CC)
   LIB_PATH=${GCC_PATH%/*/*}
   GCC_LD="\$(LD)"
@@ -165,6 +171,7 @@ AC_SUBST(CC)
 AC_SUBST(GCC_LD)
 AC_SUBST(DEBUGFLAG)
 AC_SUBST(EC)
+AC_SUBST(NO_EC)
 AC_SUBST(EC_MODE)
 AC_SUBST(engine2)
 AC_SUBST(engine_fast2)
@@ -193,7 +200,6 @@ AC_MSG_RESULT($ac_export_dynamic)
 
 #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
 case "$host_cpu" in
 	arm*)
 		machine=arm
@@ -236,14 +242,20 @@ case "$host_cpu" in
 		;;
 	i486)
 		machine=386
-		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -m486"
+		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr"
+		CFLAGS_1="$CFLAGS"
+		CFLAGS="$CFLAGS -march=i486"
+		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
+		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1")
 		;;
 	i*86)
 		machine=386
 		CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr"
 		CFLAGS_1="$CFLAGS"
-		CFLAGS="$CFLAGS -march=pentium"
+		CFLAGS="$CFLAGS -march=pentium -mtune=generic"
+		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -march=pentium")
 		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
+		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1")
 		;;
 	x86_64)
 		case $CC
@@ -276,6 +288,7 @@ case "$host_cpu" in
 		;;
 	mips*)
 		machine=mips
+		AC_LIBOBJ(../arch/mips/check_prim) 
 		#dynamic native code has the following problems on MIPS:
 		#
 		#1) J/JAL seems relocatable, but is are only
@@ -328,6 +341,7 @@ esac
 AC_SUBST(host)
 
 MAKEINC=""
+GFORTH_EXE="true"
 
 echo "Check for arch/$machine/$platform/gforth.ld ($EC_MODE)"
 if test x$EC_MODE = xtrue
@@ -343,6 +357,7 @@ then
 	if test -f arch/$machine/$platform/make.inc
 	then
 		MAKEINC="include ../arch/$machine/$platform/make.inc"
+		GFORTH_EXE="\$(MAKE) -f arch/$machine/$platform/make.inc \$@.exe"
 	fi
 fi
 AC_SUBST(MAKEINC)
@@ -471,6 +486,31 @@ esac
 AC_MSG_RESULT($ac_cv_tetrabyte_type_cell)
 AC_DEFINE_UNQUOTED(TETRABYTE_TYPE,$ac_cv_tetrabyte_type_cell,[an integer type that is 4 bytes long])
 
+AC_MSG_CHECKING([for a C type for octabytes])
+ac_cv_octabyte_type_cell=none
+case 8 in
+  $ac_cv_sizeof_int)
+    ac_cv_octabyte_type_cell=int
+    ;;
+  $ac_cv_sizeof_short)
+    ac_cv_octabyte_type_cell=short
+    ;;
+  $ac_cv_sizeof_char)
+    ac_cv_octabyte_type_cell=char
+    ;;
+  $ac_cv_sizeof_long)
+    ac_cv_octabyte_type_cell=long
+    ;;
+  $ac_cv_sizeof_long_long)
+    ac_cv_octabyte_type_cell="long long"
+    ;;
+  $ac_cv_sizeof_intptr_t)
+    ac_cv_octabyte_type_cell="intptr_t"
+    ;;
+esac
+AC_MSG_RESULT($ac_cv_octabyte_type_cell)
+AC_DEFINE_UNQUOTED(OCTABYTE_TYPE,$ac_cv_octabyte_type_cell,[an integer type that is 8 bytes long])
+
 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
@@ -608,6 +648,21 @@ AC_TRY_COMPILE(,,ac_align_jumps=yes;ENGI
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_align_jumps)
 
+if test -z "$LIBTOOL_CC"
+then
+  LIBTOOL_CC="$CC"
+  # Try if GCC understands -Wimplicit-function-declaration
+  AC_MSG_CHECKING([if $CC understands -Wimplicit-function-declaration])
+  CFLAGS_1="$CFLAGS"
+  CFLAGS="$CFLAGS -Wimplicit-function-declaration"
+  AC_TRY_COMPILE(,,LIBTOOL_CC="$CC -Wimplicit-function-declaration",)
+  CFLAGS="$CFLAGS_1"
+  AC_MSG_RESULT($ac_align_jumps)
+fi
+AC_SUBST(LIBTOOL_CC)
+
+
+
 # Try if GCC understands __attribute__((unused))
 AC_MSG_CHECKING([how to suppress 'unused variable' warnings])
 AC_TRY_COMPILE(,[int __attribute__((unused)) foo;], MAYBE_UNUSED='__attribute__((unused))',)
@@ -643,11 +698,19 @@ AC_MSG_RESULT($PREFORTH)
 #echo "machine='$machine'"
 
 dnl AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine)
-AC_CHECK_FILE($srcdir/arch/$machine/asm.fs,[asm_fs=arch/$machine/asm.fs],)
+if test x$EC_MODE = xfalse
+then
+  AS_IF([test -f $srcdir/arch/$machine/asm.fs],
+        [asm_fs=arch/$machine/asm.fs])
+fi
 AC_SUBST(asm_fs)
 
 dnl AC_CHECK_PROG(disasm_fs,disasm.fs,arch/$machine/disasm.fs,,$srcdir/arch/$machine)
-AC_CHECK_FILE($srcdir/arch/$machine/disasm.fs,[disasm_fs=arch/$machine/disasm.fs],)
+if test x$EC_MODE = xfalse
+then
+  AS_IF([test -f $srcdir/arch/$machine/disasm.fs],
+   	[disasm_fs=arch/$machine/disasm.fs])
+fi
 AC_SUBST(disasm_fs)
 
 AC_PATH_PROG(INSTALL_INFO,install-info,[echo '>>>>Please make info dir entry:'],$PATH:/sbin:/usr/sbin:/usr/local/sbin)
@@ -704,14 +767,13 @@ fi
 AC_CHECK_PROG([MASSAGE_EXE],[chcon],[chcon -t unconfined_execmem_exec_t],[true])
 
 dnl Now a little support for DOS/DJGCC
+GFORTHFAST_EXE="$GFORTH_EXE"
+GFORTHITC_EXE="$GFORTH_EXE"
+GFORTHDITC_EXE="$GFORTH_EXE"
 AC_SUBST(GFORTH_EXE)
-GFORTH_EXE="true"
 AC_SUBST(GFORTHFAST_EXE)
-GFORTHFAST_EXE="true"
 AC_SUBST(GFORTHITC_EXE)
-GFORTHITC_EXE="true"
 AC_SUBST(GFORTHDITC_EXE)
-GFORTHDITC_EXE="true"
 
 AC_SUBST(FORTHSIZES)
 
@@ -752,7 +814,11 @@ fi
 #echo "CFLAGS=$CFLAGS"
 #echo "ac_link=$ac_link"
 AC_MSG_CHECKING([if and how we can waste code space])
-if test -z "$skipcode"; then
+if test -z "$skipcode" && test x$cross_compiling = xyes; then
+   # we cannot perform the AC_TRY_RUN check when cross-compiling.  
+   skipcode=no
+   AC_MSG_RESULT([$skipcode, can't run checks since cross-compiling])
+elif test -z "$skipcode"; then
     skipcode=no
     CFLAGS_1="$CFLAGS"
     CFLAGS="$CFLAGS $ENGINE_FLAGS"
@@ -790,7 +856,7 @@ then
 	no_dynamic_default=1
 	AC_MSG_WARN(Disabling default dynamic native code generation)
     fi
-    AC_DEFINE_UNQUOTED(SKIP16,((void)0),statement for skipping 16 bytes)
+    AC_DEFINE_UNQUOTED(SKIP16,asm(""),statement for skipping 16 bytes)
 else
     AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes)
 fi
@@ -824,19 +890,27 @@ AC_CHECK_PROGS(TEXI2DVI,texi2dvi4a2ps te
 dnl MacOS X has a libtool that does something else
 AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool)
 
-if test -n "$GNU_LIBTOOL"; then
+dnl Checks for library functions
+dnl This check is just for making later checks link with libm.
+dnl using sin here is no good idea since it is built-into gcc and typechecked
+AC_CHECK_LIB(m,asin)
+AC_CHECK_LIB(ltdl,lt_dlinit)
+
+if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then
   build_libcc_named=build-libcc-named
 else
   build_libcc_named=""
+  AC_MSG_WARN([No GNU_LIBTOOL found, skip pre-building libcc-based libraries])
 fi
 AC_SUBST(build_libcc_named)
 
 
-dnl Checks for library functions
-dnl This check is just for making later checks link with libm.
-dnl using sin here is no good idea since it is built-into gcc and typechecked
-AC_CHECK_LIB(m,asin)
-AC_CHECK_LIB(ltdl,lt_dlinit)
+if test -z "$GNU_LIBTOOL"; then
+  AC_MSG_WARN([No GNU_LIBTOOL found, using "libtool" as name.])
+  AC_MSG_WARN([libcc.fs won't work until you have installed (GNU) libtool.])
+  GNU_LIBTOOL=libtool
+fi
+
 #check for libffi 2.x
 AC_CHECK_HEADER(ffi.h,FFI_H_NAME=ffi.h,)
 if test -z "$FFI_H_NAME"; then
@@ -883,7 +957,7 @@ AC_CHECK_FUNCS(expm1 log1p)
 AC_REPLACE_FUNCS(rint ecvt)
 dnl No check for select, because our replacement is no good under
 dnl anything but DOS
-AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h wchar.h)
+AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h wchar.h endian.h)
 AC_FUNC_FNMATCH
 test $ac_cv_func_fnmatch_works = yes || AC_LIBOBJ(fnmatch)
 AC_CHECK_FUNCS(mmap sysconf getpagesize wcwidth)
@@ -925,4 +999,3 @@ ln -sf ../../../engine/config.h ../../..
 [PACKAGE_VERSION=$PACKAGE_VERSION
  machine=$machine])
 AC_OUTPUT
-