--- gforth/configure.in	2008/08/09 14:39:09	1.236
+++ gforth/configure.in	2008/10/06 20:59:17	1.245
@@ -20,12 +20,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-20080716],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.6.9-20081006],[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="July 16, 2008"
+UPDATED="October 10, 2008"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
@@ -150,7 +150,7 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor
 
 AC_MSG_CHECKING([whether to use two dispatches per conditional branch])
 test x$condbranch_opt = x && 
-if ($CC -v 2>&1 |grep -q 'gcc version 3'); then
+if ($CC -v 2>&1 |grep 'gcc version 3' >/dev/null); then
    condbranch_opt=0
 else
    condbranch_opt=1
@@ -303,7 +303,7 @@ case "$host_cpu" in
 		AC_CHECK_FUNC(_sync_cache_range,[true],[AC_LIBOBJ(../arch/power/_sync_cache_range)])
 		#long long is broken on (at least) gcc-2.95.* for PPC
 		test x$ac_cv_sizeof_long_long = x && 
-		($CC -v 2>&1 |grep -q 'gcc version 2.95') &&
+		($CC -v 2>&1 |grep 'gcc version 2.95' >/dev/null) &&
 		ac_cv_sizeof_long_long=0
                 #The only architecture with enough callee-saved registers
                 test x$STACK_CACHE_REGS = x && STACK_CACHE_REGS=3
@@ -528,7 +528,7 @@ else
         fi
 fi
 
-if grep -q FORCE_REG arch/$machine/machine.h; then
+if grep FORCE_REG arch/$machine/machine.h >/dev/null; then
    OPTS2=''
    for i in $OPTS; do OPTS2="$OPTS2 $i-reg"; done
    OPTS="$OPTS2 $OPTS"
@@ -617,17 +617,17 @@ else
  M4=m4
 fi
 AC_SUBST(M4)
-AC_DEFINE_UNQUOTED(M4,"$M4",[How to invoke m4])
 AC_MSG_RESULT($M4)
 
 # Find installed Gforth
 AC_MSG_CHECKING([for gforth])
 GFORTH="`cd / && which gforth 2>/dev/null`"
+(cd / && $GFORTH -e bye >/dev/null 2>/dev/null) || GFORTH=""
 if test -z "$GFORTH"; then
   PREFORTH='echo "You need to configure with a gforth in \$PATH to build this part" && false'
   kernel_anti_dependence=''
 else
-  PREFORTH="$GFORTH -i `cd / && gforth --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ;
+  PREFORTH="$GFORTH -i `cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ;
   kernel_anti_dependence='$(kernel_fi)'
 fi
 AC_SUBST(PREFORTH)
@@ -665,6 +665,9 @@ case "$host_os" in
 		DIRSEP="/"
 		PATHSEP=":"
 		DEFAULTSYSTEMPREFIX=""
+                #the following magic value was suggested by
+                #http://mail.python.org/pipermail/pythonmac-sig/2005-October/015190.html
+                AC_DEFINE_UNQUOTED(MACOSX_DEPLOYMENT_TARGET,"10.3",[an environment variable value needed by libtool on some MacOS X versions])
 		;;
 	*)
 		DIRSEP="/"
@@ -810,8 +813,13 @@ dnl using sin here is no good idea since
 AC_CHECK_LIB(m,asin)
 AC_CHECK_LIB(ltdl,lt_dlinit)
 #check for libffi 2.x
+AC_CHECK_HEADER(ffi.h,FFI_H_NAME=ffi.h,)
+if test -z "$FFI_H_NAME"; then
+  AC_CHECK_HEADER(ffi/ffi.h,FFI_H_NAME=ffi/ffi.h,)
+fi
+AC_SUBST(FFI_H_NAME)
 AC_CHECK_LIB(ffi,ffi_call)
-if test $ac_cv_lib_ffi_ffi_call = yes
+if test -n "$FFI_H_NAME" -a $ac_cv_lib_ffi_ffi_call = yes
 then
   LIBFFIFLAG="true"
   LIBCC_BUILD_SRC="$LIBCC_BUILD_SRC libffi.fs"
@@ -850,7 +858,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)
+AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h)
 AC_FUNC_FNMATCH
 test $ac_cv_func_fnmatch_works = yes || AC_LIBOBJ(fnmatch)
 AC_CHECK_FUNCS(mmap sysconf getpagesize)