[seed] Reference the right pkg-config for webkit in seed.pc
- From: Alan Knowles <alank src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seed] Reference the right pkg-config for webkit in seed.pc
- Date: Mon, 9 Aug 2010 03:27:14 +0000 (UTC)
commit f0a4e7be5ea6bdc5f991e806c972bca0d47791fc
Author: Vincent Untz <vuntz gnome org>
Date: Sat Aug 7 01:59:41 2010 +0200
Reference the right pkg-config for webkit in seed.pc
We need to make sure we reference webkit-1.0 if we build seed against
webkit-1.0.
configure.ac | 6 ++++--
seed.pc.in | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e8d6690..56253a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ AC_ARG_WITH([webkit],
dnl=== support both 1.0 and 3.0 (default 3.0) ==
AS_CASE([$with_webkit],
[gtk-3.0], [
- PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)
+ WEBKIT_PC=webkitgtk-3.0
],
[1.0], [
save_LIBS=$LIBSma
@@ -92,11 +92,13 @@ AS_CASE([$with_webkit],
AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,,
AC_MSG_ERROR([The installed version of WebKit is too old. Seed requires WebKit SVN revision 35442 or greater.]))
LIBS=$save_LIBS
- PKG_CHECK_MODULES(WEBKIT, webkit-1.0)
+ WEBKIT_PC=webkit-1.0
],
[AC_MSG_ERROR([Invalid argument for --with-webkit])]
)
+PKG_CHECK_MODULES(WEBKIT, $WEBKIT_PC)
+AC_SUBST(WEBKIT_PC)
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LDFLAGS)
dnl =========================Introspection=====================================
diff --git a/seed.pc.in b/seed.pc.in
index dc5f4a4..b3eb12a 100644
--- a/seed.pc.in
+++ b/seed.pc.in
@@ -5,7 +5,7 @@ bindir= bindir@
includedir= includedir@
Cflags: -I${includedir}/seed
-Requires: webkitgtk-3.0 gobject-introspection-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
+Requires: @WEBKIT_PC@ gobject-introspection-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
Libs: -L${libdir} -lseed
Name: Seed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]