/soc/2013/ankitkv/gobjectification: 15af9d331ee4: Added external...

[Ankit Vani]

Changeset: 15af9d331ee455d56542ae9eab85c26d2778af02
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-27 00:16 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/15af9d331ee4

Description:

Added external dependency for GPlugin 0.0.3

diffstat:

 acinclude.m4 |   5 +----
 configure.ac |  20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diffs (59 lines):

diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,7 +6,7 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 # Owen Taylor     1997-2001
 
 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gobject or 
 dnl gthread is specified in MODULES, pass to pkg-config
 dnl
 AC_DEFUN([AM_PATH_GLIB_2_0],
@@ -20,9 +20,6 @@ AC_ARG_ENABLE(glibtest, [  --disable-gli
   for module in . $4
   do
       case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
          gobject) 
              pkg_config_args="$pkg_config_args gobject-2.0"
          ;;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -335,10 +335,7 @@ AM_CONDITIONAL(INSTALL_I18N, test "x$ena
 dnl #######################################################################
 dnl # Check for GLib 2.20 (required)
 dnl #######################################################################
-# TODO: gmodule-2.0 is only needed if enable_plugins is 'yes'.  It
-#       might be nice to change this check so that it's not required
-#       if enable_plugins is 'no'.
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.20.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.20.0 gobject-2.0 gthread-2.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
@@ -1703,6 +1700,21 @@ AC_SUBST(KWALLET_LIBS)
 AM_CONDITIONAL(ENABLE_KWALLET, test "x$enable_kwallet" = "xyes")
 
 dnl #######################################################################
+dnl # Check for GPlugin 0.0.3
+dnl #######################################################################
+if test "x$enable_plugins" = "xyes" ; then
+	PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.3 gmodule-2.0], , [
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR([
+	GPlugin 0.0.3 development headers not found, which are required if you wish
+	to enable plugins.
+	Use --disable-plugins if you do not need plugins.
+	])])
+	AC_SUBST(GPLUGIN_CFLAGS)
+	AC_SUBST(GPLUGIN_LIBS)
+fi
+
+dnl #######################################################################
 dnl # Check for Python
 dnl #######################################################################