[seed] Patches from Maciej Piechotka, bugs #579220 and #579221.



commit f5acdac571893d47309d69da8c3476eb422bf93c
Author: Tim Horton <hortont hortont com>
Date:   Thu Apr 16 20:44:53 2009 -0400

    Patches from Maciej Piechotka, bugs #579220 and #579221.
    
    * Add version checking for introspection (>=0.6.3)
    * Don't check for libffi in the wrong place
---
 configure.ac        |    8 ++++----
 libseed/Makefile.am |    2 +-
 src/Makefile.am     |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b3498e..9ee2202 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,12 +233,12 @@ case "$host_os" in
 	darwin*)
 		SEED_OSX_CFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
 		SEED_OSX_LDFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
-		PKG_CHECK_MODULES(SEED, gobject-introspection-1.0)
-		PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0)
+		PKG_CHECK_MODULES(SEED, gobject-introspection-1.0 >= 0.6.3)
+		PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0 >= 0.6.3)
 		;;
 	*)
-		PKG_CHECK_MODULES(SEED, webkit-1.0 gobject-introspection-1.0 libffi)
-		PKG_CHECK_MODULES(LIBSEED, webkit-1.0 gobject-introspection-1.0 libffi)
+		PKG_CHECK_MODULES(SEED, webkit-1.0 gobject-introspection-1.0 >= 0.6.3)
+		PKG_CHECK_MODULES(LIBSEED, webkit-1.0 gobject-introspection-1.0  >= 0.6.3)
 		;;
 esac
 AC_SUBST(SEED_OSX_CFLAGS)
diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index 736c049..e61ec1e 100644
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -24,7 +24,7 @@ libseed_la_SOURCES = \
 	seed-importer.c \
 	seed-importer.h 
 
-libseed_la_LIBADD = $(LIBSEED_LIBS)
+libseed_la_LIBADD = $(LIBSEED_LIBS) $(LIBFFI_LIBS)
 libseed_la_CPPFLAGS = -lgmodule-2.0 $(LIBSEED_CFLAGS) $(SEED_OSX_CFLAGS) $(FFI_CFLAGS)
 libseed_la_LDFLAGS = -no-undefined $(SEED_PROFILE_LDFLAGS) $(SEED_OSX_LDFLAGS) $(FFI_LIBS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 317cc7a..ba39d99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,4 +23,5 @@ seed_LDFLAGS = \
 
 seed_LDADD = \
 	$(SEED_LIBS) \
+	$(LIBFFI_LIBS) \
 	-lseed



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]