[devhelp] libdevhelp: Fix .pc file requires when building with webkit2gtk-4.0
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] libdevhelp: Fix .pc file requires when building with webkit2gtk-4.0
- Date: Sun, 24 Aug 2014 06:11:37 +0000 (UTC)
commit 07b29a53eac7d4add1e0d7100d6bf2ecdea36f84
Author: Kalev Lember <kalevlember gmail com>
Date: Fri Aug 22 23:19:09 2014 +0200
libdevhelp: Fix .pc file requires when building with webkit2gtk-4.0
Substitute either webkit2gtk-3.0 or webkit2gtk-4.0 in the .pc file,
depending on what webkit2gtk version devhelp was built with.
https://bugzilla.gnome.org/show_bug.cgi?id=735252
configure.ac | 1 +
data/libdevhelp-3.0.pc.in | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e3a7a02..48cdbf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ PKG_CHECK_EXISTS([webkit2gtk-4.0], [
], [
WEBKIT_PKGCONFIG=webkit2gtk-3.0
])
+AC_SUBST(WEBKIT_PKGCONFIG)
PKG_CHECK_MODULES(DEVHELP, [
gthread-2.0 >= 2.10.0
diff --git a/data/libdevhelp-3.0.pc.in b/data/libdevhelp-3.0.pc.in
index 577a3c2..6401ee3 100644
--- a/data/libdevhelp-3.0.pc.in
+++ b/data/libdevhelp-3.0.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
Name: devhelp
Description: devhelp
-Requires: gtk+-3.0 webkit2gtk-3.0
+Requires: gtk+-3.0 @WEBKIT_PKGCONFIG@
Version: @VERSION@
Libs: -L${libdir} -ldevhelp-3
Cflags: -I${includedir}/devhelp-3.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]