/soc/2013/ankitkv/gobjectification: 04b75bcbaf79: Backed out cha...

[Ankit Vani]

Changeset: 04b75bcbaf79d6064d198a92899b419d10a8ea1a
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-03 05:09 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/04b75bcbaf79

Description:

Backed out changeset 0e5eae8b3487

diffstat:

 acinclude.m4 |   5 +----
 configure.ac |  21 +++++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs (60 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],
@@ -26,9 +26,6 @@ AC_ARG_ENABLE(glibtest, [  --disable-gli
          gthread) 
              pkg_config_args="$pkg_config_args gthread-2.0"
          ;;
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
       esac
   done
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,7 @@ AM_CONDITIONAL(INSTALL_I18N, test "x$ena
 dnl #######################################################################
 dnl # Check for GLib 2.20 (required)
 dnl #######################################################################
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.20.0 gobject-2.0 gthread-2.0 gmodule-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([
 
@@ -1702,13 +1702,18 @@ AM_CONDITIONAL(ENABLE_KWALLET, test "x$e
 dnl #######################################################################
 dnl # Check for GPlugin 0.0.4
 dnl #######################################################################
-PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.4], , [
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR([
-You must have GPlugin 0.0.4 or newer development headers installed to build.
-])])
-AC_SUBST(GPLUGIN_CFLAGS)
-AC_SUBST(GPLUGIN_LIBS)
+if test "x$enable_plugins" = "xyes" ; then
+	PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.4 gmodule-2.0], , [
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR([
+	GPlugin 0.0.4 development headers not found, which are required if you wish to
+	enable plugins.
+	Use --disable-plugins if you want to disable plugins (will also disable
+	protocols).
+	])])
+	AC_SUBST(GPLUGIN_CFLAGS)
+	AC_SUBST(GPLUGIN_LIBS)
+fi
 
 dnl #######################################################################
 dnl # Check for Python