--- gforth/configure.in	2008/08/16 16:54:20	1.239
+++ gforth/configure.in	2008/08/19 13:59:00	1.241
@@ -623,7 +623,7 @@ AC_MSG_RESULT($M4)
 # Find installed Gforth
 AC_MSG_CHECKING([for gforth])
 GFORTH="`cd / && which gforth 2>/dev/null`"
-$GFORTH -e bye >/dev/null 2>/dev/null || GFORTH=""
+(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=''
@@ -817,7 +817,7 @@ if test -z "$FFI_H_NAME"; then
 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"