/soc/2013/ankitkv/gobjectification: 2d3fd6d26731: Remove conditi...

[Ankit Vani]

Changeset: 2d3fd6d26731fc6c45a3409193728947fc694679
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-24 16:55 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/2d3fd6d26731

Description:

Remove condition from GOBJECT_INTROSPECTION_CHECK, but use gir only when plugins are enabled

diffstat:

 configure.ac          |  2 +-
 libpurple/Makefile.am |  2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (29 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1693,8 +1693,8 @@ AM_CONDITIONAL(ENABLE_KWALLET, test "x$e
 dnl #######################################################################
 dnl # Check for GPlugin 0.0.9
 dnl #######################################################################
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
 if test "x$enable_plugins" = "xyes" ; then
-	GOBJECT_INTROSPECTION_CHECK([1.30.0])
 	PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.9 gmodule-2.0], , [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -390,6 +390,7 @@ if ! INSTALL_SSL_CERTIFICATES
 AM_CPPFLAGS += -DSSL_CERTIFICATES_DIR=\"$(SSL_CERTIFICATES_DIR)\"
 endif
 
+if PLUGINS
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
@@ -415,3 +416,4 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
+endif