[seed] Revert "Revert "Fix checking for libffi""

[Robert Carr <racarr src gnome org>]

commit df1ac9c5cd3bc5ba6cfe09d177419c53f9070626
Author: Robert Carr <racarr svn gnome org>
Date:   Mon Apr 27 17:09:50 2009 -0400

    Revert "Revert "Fix checking for libffi""
    
    This reverts commit 5d4d99016decfdf65b0cb8e973b48444e0cb2a15.
---
 configure.ac        |   11 ++++++-----
 libseed/Makefile.am |    4 ++--
 src/Makefile.am     |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8eba9e5..c15d277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
 dnl ============================libffi=========================================
-PKG_CHECK_MODULES(libffi, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
+PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
 
 if test x"$have_ffi_pkgconfig" = xno ; then
 	AC_MSG_CHECKING(for ffi.h)
@@ -56,9 +56,9 @@ if test x"$have_ffi_pkgconfig" = xno ; then
 
 		AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
 		if test x"$ac_cv_search_ffi_call" = x"none required" ; then
-			FFI_LIBS=$other_LIBS
+			FFI_LDFLAGS=$other_LIBS
 		else
-			FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
+			FFI_LDFLAGS="$ac_cv_search_ffi_call $other_LIBS"
 		fi
 		LIBS=$save_LIBS
 	fi
@@ -69,10 +69,11 @@ if test x"$have_ffi_pkgconfig" = xno ; then
 	FFI_CFLAGS=
 
 	AC_MSG_RESULT([$have_ffi_h])
-	AC_SUBST(FFI_LIBS)
-	AC_SUBST(FFI_CFLAGS)
 fi
 
+AC_SUBST(FFI_LIBS)
+AC_SUBST(FFI_CFLAGS)
+
 dnl =======================WebKit ContextGroup=================================
 case "$host_os" in
 	darwin*)
diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index 7582402..ce9a48e 100644
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -24,9 +24,9 @@ libseed_la_SOURCES = \
 	seed-importer.c \
 	seed-importer.h 
 
-libseed_la_LIBADD = $(LIBSEED_LIBS) $(LIBFFI_LIBS)
+libseed_la_LIBADD = $(LIBSEED_LIBS) $(LIBFFI_LDFLAGS)
 libseed_la_CPPFLAGS = -lgmodule-2.0 $(LIBSEED_CFLAGS) $(SEED_OSX_CFLAGS) $(FFI_CFLAGS) -Wall
-libseed_la_LDFLAGS = -no-undefined $(SEED_PROFILE_LDFLAGS) $(SEED_OSX_LDFLAGS) $(FFI_LIBS)
+libseed_la_LDFLAGS = -no-undefined $(SEED_PROFILE_LDFLAGS) $(SEED_OSX_LDFLAGS) $(FFI_LDFLAGS)
 
 seedheaders_HEADERS = seed.h
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ba39d99..46efaf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,5 +23,5 @@ seed_LDFLAGS = \
 
 seed_LDADD = \
 	$(SEED_LIBS) \
-	$(LIBFFI_LIBS) \
+	$(LIBFFI_LDFLAGS) \
 	-lseed