/pidgin/main: d3e1e2a9d014: added the webkit modules to the requ...

[Gary Kramlich]

Changeset: d3e1e2a9d0145c9894600aebdde22406828d2ac1
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2013-04-07 17:45 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/d3e1e2a9d014

Description:

added the webkit modules to the requires field of pidgin-3.pc

diffstat:

 configure.ac          |  7 +++++--
 pidgin/pidgin-3.pc.in |  2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (41 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -471,7 +471,8 @@ running configure.
 
 	WEBKIT_VERSION=1.1.1
 	if test "x$with_gtk" = "x3"; then
-		PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_VERSION], , [
+		WEBKIT_PC_MODULE="webkitgtk-3.0"
+		PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
 			AC_MSG_RESULT(no)
 			AC_MSG_ERROR([
 You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers
@@ -479,7 +480,8 @@ installed to compile Pidgin.  If you wan
 --disable-gtkui when running configure.
 ])])
 	else
-		PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_VERSION], , [
+		WEBKIT_PC_MODULE="webkit-1.0"
+		PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
 			AC_MSG_RESULT(no)
 			AC_MSG_ERROR([
 You must have WebKit for GTK+2 $WEBKIT_VERSION or newer development headers
@@ -489,6 +491,7 @@ installed to compile Pidgin.  If you wan
 	fi
 	AC_SUBST(WEBKIT_CFLAGS)
 	AC_SUBST(WEBKIT_LIBS)
+	AC_SUBST(WEBKIT_PC_MODULE)
 
 	dnl #######################################################################
 	dnl # Check if we should compile with X support
diff --git a/pidgin/pidgin-3.pc.in b/pidgin/pidgin-3.pc.in
--- a/pidgin/pidgin-3.pc.in
+++ b/pidgin/pidgin-3.pc.in
@@ -11,5 +11,5 @@ plugindir=${libdir}/pidgin
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
-Requires: @GTK_PC_MODULE@ purple-3
+Requires: @GTK_PC_MODULE@ @WEBKIT_PC_MODULE@ purple-3
 Cflags: -I${includedir}