***UNCHECKED*** /pidgin/main: 1ba4b6569381: Conditionally add gplugin and gplugi...

Changeset: 1ba4b656938173f4ed45ca1bbcf8555fe0c133f3
Author:	 Michael McConville <[email protected]>
Date:	 2015-08-07 18:15 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1ba4b6569381

Description:

Conditionally add gplugin and gplugin-gtk to libpurple's pkg-config requirements (ok'd by elb)

diffstat:

 configure.ac                  |  10 +++++++++-
 libpurple/data/purple-3.pc.in |   2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (37 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1888,13 +1888,21 @@ dnl ####################################
 dnl # Check for GPlugin 0.0.17
 dnl #######################################################################
 if test "x$enable_plugins" = "xyes" ; then
-	PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.17 gmodule-2.0], , [
+	PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.17 gmodule-2.0], [
+		dnl # GPLUGIN_REQ sets pkg-config requirements in the .pc file
+		if test "x$with_gtk" != "xno" ; then
+			GPLUGIN_REQ=[", gplugin, gplugin-gtk"]
+		else
+			GPLUGIN_REQ=[", gplugin"]
+		fi
+	], [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([
 	GPlugin 0.0.17 development headers not found, which are required if you wish to
 	enable plugins.
 	Use --disable-plugins if you want to disable plugins.
 	])])
+	AC_SUBST(GPLUGIN_REQ)
 	AC_SUBST(GPLUGIN_CFLAGS)
 	AC_SUBST(GPLUGIN_LIBS)
 else
diff --git a/libpurple/data/purple-3.pc.in b/libpurple/data/purple-3.pc.in
--- a/libpurple/data/purple-3.pc.in
+++ b/libpurple/data/purple-3.pc.in
@@ -12,6 +12,6 @@ plugindir=${libdir}/purple-@PURPLE_MAJOR
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
-Requires: glib-2.0
+Requires: glib-2.0@GPLUGIN_REQ@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpurple

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits