--- a/ChangeLog	Sun Feb 17 16:39:29 2008 -0500
+++ b/ChangeLog	Mon Feb 18 08:04:20 2008 -0500
@@ -1,3 +1,9 @@
+2008-02-18  Gary Benson  <gbenson@redhat.com>
+
+	* configure.ac: Check for libffi whenever building with zero.
+	* Makefile.am (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass libffi settings.
+	* Makefile.in, configure: Regenerated.
+
 2008-02-17  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am (patch.stamp): Stop and fail when patch doesn't apply.

--- a/Makefile.am	Sun Feb 17 16:39:29 2008 -0500
+++ b/Makefile.am	Mon Feb 18 08:04:20 2008 -0500
@@ -74,7 +74,9 @@
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -115,7 +117,9 @@
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
-	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+	"LIBFFI_LIBS=$(LIBFFI_LIBS)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \

--- a/configure	Sun Feb 17 16:39:29 2008 -0500
+++ b/configure	Mon Feb 18 08:04:20 2008 -0500
@@ -10021,8 +10021,7 @@
 
 fi
 
-case "$build" in
-        *powerpc*)
+if test "x${CORE_BUILD_TRUE}" = x; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for LIBFFI" >&5
@@ -10094,20 +10093,17 @@
 echo "${ECHO_T}yes" >&6; }
 	LIBFFI_FOUND=yes
 fi
-          if test "x${LIBFFI_FOUND}" = xno
-          then
-            { { echo "$as_me:$LINENO: error: Could not find libffi headers - \
-	    Try installing libffi-devel." >&5
+  if test "x${LIBFFI_FOUND}" = xno
+  then
+    { { echo "$as_me:$LINENO: error: Could not find libffi headers - \
+    Try installing libffi-devel." >&5
 echo "$as_me: error: Could not find libffi headers - \
-	    Try installing libffi-devel." >&2;}
-   { (exit 1); exit 1; }; }
-          fi
-
-
-        ;;
-        *i*86*)
-        ;;
-esac
+    Try installing libffi-devel." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure

--- a/configure.ac	Sun Feb 17 16:39:29 2008 -0500
+++ b/configure.ac	Mon Feb 18 08:04:20 2008 -0500
@@ -286,20 +286,16 @@
 AC_SUBST(GTK_LIBS)
 fi
 
-case "$build" in
-        *powerpc*)
-          dnl Check for libffi headers and libraries.
-          PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
-          if test "x${LIBFFI_FOUND}" = xno
-          then
-            AC_MSG_ERROR([Could not find libffi headers - \
-	    Try installing libffi-devel.])
-          fi
-          AC_SUBST(LIBFFI_CFLAGS)
-          AC_SUBST(LIBFFI_LIBS)
-        ;;
-        *i*86*)
-        ;;
-esac
+if test "x${CORE_BUILD_TRUE}" = x; then
+  dnl Check for libffi headers and libraries.
+  PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
+  if test "x${LIBFFI_FOUND}" = xno
+  then
+    AC_MSG_ERROR([Could not find libffi headers - \
+    Try installing libffi-devel.])
+  fi
+fi
+AC_SUBST(LIBFFI_CFLAGS)
+AC_SUBST(LIBFFI_LIBS)
 
 AC_OUTPUT