[folks] Make gobject-introspection a hard requirement.



commit e469532a16c4b5a12b694e242404c23574fe122e
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Fri Aug 20 11:15:52 2010 -0700

    Make gobject-introspection a hard requirement.
    
    Fixes bgo#627506

 backends/telepathy/Makefile.am |    2 --
 configure.ac                   |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index ccad7ba..ab6eebf 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -51,7 +51,6 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 CLEANFILES =
 
-if HAVE_INTROSPECTION
 tp-lowlevel.gir: libtp-lowlevel.la
 tp_lowlevel_gir_INCLUDES = GObject-2.0 Gee-1.0 TelepathyGLib-0.12
 tp_lowlevel_gir_CFLAGS = $(TP_GLIB_CFLAGS)
@@ -61,7 +60,6 @@ tp_lowlevel_gir_NAMESPACE = Folks
 INTROSPECTION_GIRS += tp-lowlevel.gir
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
 
 tp-lowlevel.vapi: tp-lowlevel.gir
 	$(AM_V_GEN)$(VAPIGEN) $(VALAFLAGS) --library tp-lowlevel \
diff --git a/configure.ac b/configure.ac
index 5416f4d..05ffc60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ AC_SUBST(VAPIDIR)
 AC_PATH_PROG(VAPIGEN, vapigen, vapigen)
 AC_SUBST(VAPIGEN)
 
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_REQUIRE([0.6.7])
 
 AS_IF([test "$VAPIGEN" = ""],
 	[AC_MSG_ERROR([Vala must be built with --enable-vapigen])])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]