--- gforth/configure.in	2008/08/09 14:39:09	1.236
+++ gforth/configure.in	2008/08/19 13:59:00	1.241
@@ -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"
@@ -623,11 +623,12 @@ 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)
@@ -810,8 +811,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"