aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac29
-rw-r--r--libindicate/Makefile.am3
2 files changed, 19 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index e32da5f..fe049c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,19 +61,22 @@ AC_SUBST(LIBINDICATE_LIBS)
# GObject Introspection
###########################
-PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >= 0.6])
-
-G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-AC_SUBST(G_IR_SCANNER)
-G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-AC_SUBST(G_IR_COMPILER)
-G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-AC_SUBST(G_IR_GENERATE)
-
-GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-AC_SUBST(GIRDIR)
-TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-AC_SUBST(TYPELIBDIR)
+PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0 >= 0.6], gir_ok=yes, gir_ok=no)
+
+AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
+if test "x$gir_ok" = "xyes"; then
+ G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ AC_SUBST(G_IR_SCANNER)
+ G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ AC_SUBST(G_IR_COMPILER)
+ G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ AC_SUBST(G_IR_GENERATE)
+
+ GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ AC_SUBST(GIRDIR)
+ TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ AC_SUBST(TYPELIBDIR)
+fi
###########################
# GTK Doc
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index b851919..5a6f466 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -95,6 +95,8 @@ listener-marshal.c: $(srcdir)/listener-marshal.list
pkgconfig_DATA = indicate.pc
pkgconfigdir = $(libdir)/pkgconfig
+if USE_GIR
+
gobjectintrospection_gir_DATA = \
Indicate-0.1.gir
gobjectintrospection_girdir = $(datadir)/gir
@@ -124,3 +126,4 @@ DISTCLEANFILES = \
Indicate-0.1.gir \
Indicate-0.1.typelib
+endif