--- gforth/configure.in	2007/04/09 22:36:01	1.182
+++ gforth/configure.in	2007/06/04 18:13:26	1.188
@@ -21,12 +21,12 @@ 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.6.9-20070401],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.6.9-20070604],[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.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
-UPDATED="April 09, 2006"
+UPDATED="June 02, 2007"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
@@ -86,18 +86,20 @@ dnl   --without-peephole	disables peepho
 dnl 			but slower images.],
 dnl PEEPHOLE="$withval")
 
+GCC_LD="\$(GCC)"
+EC_MODE="false"
+EC=""
+engine2="engine2.o"
+engine_fast2="engine-fast2.o"
+no_dynamic=""
+image_i=""
+signals_o="io.o signals.o"
+
 AC_ARG_WITH(ec,
 	AC_HELP_STRING([--with-ec=<arch>],
 			[  Build gforth for systems without OS.]),
 [if test "$withval" = "no"; then
   echo "defining hosted system"
-  EC_MODE="false"
-  EC=""
-  engine2="engine2.o"
-  engine_fast2="engine-fast2.o"
-  no_dynamic=""
-  image_i=""
-  signals_o="io.o signals.o"
 else
   echo "defining standalone system (${withval})"
   AC_DEFINE(STANDALONE,,[Define if you want a Gforth without OS])
@@ -112,6 +114,10 @@ else
   else
     signals_o="io.o"
   fi
+  GCC_PATH=$(which $CC)
+  LIB_PATH=${GCC_PATH%/*/*}
+  GCC_LD="\$(LD)"
+  platform=${withval}
 fi])
 
 #variables mentioned in INSTALL
@@ -121,6 +127,7 @@ AC_ARG_VAR(STACK_CACHE_DEFAULT_FAST, [nu
 AC_ARG_VAR(GCC_PR15242_WORKAROUND, [Force the enabling (1) or disabling (0) of a workaround for a gcc-3.x performance bug (default unset: use workaround for gcc-3.x)])
 
 AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)])
+AC_ARG_VAR(ac_cv_sizeof_void_p, [sizeof(void *)])
 AC_ARG_VAR(ac_cv_sizeof_char, [sizeof(char)])
 AC_ARG_VAR(ac_cv_sizeof_short, [sizeof(short)])
 AC_ARG_VAR(ac_cv_sizeof_int, [sizeof(int)])
@@ -159,6 +166,7 @@ AC_PROG_CC
 test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher)
 
 AC_SUBST(CC)
+AC_SUBST(GCC_LD)
 AC_SUBST(DEBUGFLAG)
 AC_SUBST(EC)
 AC_SUBST(EC_MODE)
@@ -194,6 +202,9 @@ case "$host_cpu" in
 	arm*)
 		machine=arm
 		CFLAGS="$CFLAGS -fomit-frame-pointer"
+		if test x$platform = xnxt; then
+		   CFLAGS="$CFLAGS -mthumb -mthumb-interwork"
+		fi
 		if test -z $arm_cacheflush; then
 		    no_dynamic_default=1
                     arm_cacheflush=arch/arm/cacheflush0
@@ -296,6 +307,26 @@ case "$host_cpu" in
 esac
 AC_SUBST(host)
 
+MAKEINC=""
+
+echo "Check for arch/$machine/$platform/gforth.ld ($EC_MODE)"
+if test x$EC_MODE = xtrue
+then
+	echo "Check for arch/$machine/$platform/gforth.ld"
+	if test -f arch/$machine/$platform/gforth.ld
+	then
+		LDFLAGS="-T ../arch/$machine/$platform/gforth.ld -Map \$@.map -cref --gc-sections $LDFLAGS"
+		if test x$platform = xnxt; then
+			LIBS="$LIB_PATH/lib/gcc/arm-elf/$($CC --version | grep GCC | cut -d' ' -f3)/interwork/libgcc.a $LIB_PATH/arm-elf/lib/interwork/libc.a $LIBS"
+		fi
+	fi
+	if test -f arch/$machine/$platform/make.inc
+	then
+		MAKEINC="include ../arch/$machine/$platform/make.inc"
+	fi
+fi
+AC_SUBST(MAKEINC)
+
 test x$STACK_CACHE_DEFAULT_FAST = x && STACK_CACHE_DEFAULT_FAST=1
 AC_DEFINE_UNQUOTED(STACK_CACHE_DEFAULT_FAST, $STACK_CACHE_DEFAULT_FAST,
 		   [number of registers in the default stack cache state for gforth-fast and gforth-native])
@@ -327,6 +358,19 @@ case "$ac_cv_sizeof_char_p" in
     ;;
 esac
 
+AC_CHECK_SIZEOF(void *)
+case "$ac_cv_sizeof_void_p" in
+  2)
+    vwordsize=16
+    ;;
+  4)
+    vwordsize=32
+    ;;
+  8)
+    vwordsize=64
+    ;;
+esac
+
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
@@ -725,7 +769,7 @@ then
 fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)
 AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage)
+AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep)
 AC_CHECK_TYPES(stack_t,,,[#include <signal.h>])
 AC_DECL_SYS_SIGLIST
 AC_CHECK_FUNC(getopt_long,[true],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])
@@ -739,7 +783,7 @@ test $ac_cv_func_fnmatch_works = yes ||
 AC_CHECK_FUNCS(mmap sysconf getpagesize)
 AM_PATH_LISPDIR
 
-kernel_fi=kernl${wordsize}${bytesex}.fi
+kernel_fi=kernl${vwordsize}${bytesex}.fi
 include_fi=kernl${wordsize}${bytesex}${EC}.fi
 AC_SUBST(kernel_fi)
 AC_SUBST(include_fi)
@@ -749,6 +793,8 @@ AC_SUBST(include_fi)
 #if test $srcdir = "."; then srcdir=`pwd` 
 #fi
 
+echo "version=$PACKAGE_VERSION"
+
 AC_SUBST(machine)
 AC_CONFIG_FILES([
 Makefile
@@ -758,12 +804,15 @@ vmgen
 machpc.fs
 envos.fs
 engine/Makefile
+engine/libcc.h
 doc/version.texi
 build-ec ])
 AC_CONFIG_COMMANDS([stamp-h],[[echo timestamp > stamp-h
 chmod +x gforthmi
 chmod +x vmgen
 chmod +x build-ec
-test -d kernel||mkdir kernel]],[[]])
+test -d kernel||mkdir kernel
+$srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION
+ln -s ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],[[PACKAGE_VERSION=$PACKAGE_VERSION]])
 AC_OUTPUT