summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-12 10:39:41 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-12 10:39:41 +0100
commit1805c999c252c209551c1c5cf1520758e8e84cba (patch)
tree046ae5207d95dc2378386e118d4bbde69a95bcc2
parent5599f82847186e6e7a158aa7ba6656d8daaab0db (diff)
downloadmsitools-1805c999c252c209551c1c5cf1520758e8e84cba.tar.gz
msitools-1805c999c252c209551c1c5cf1520758e8e84cba.tar.xz
msitools-1805c999c252c209551c1c5cf1520758e8e84cba.zip
add Automake conditional for GIR support
-rw-r--r--configure.ac1
-rw-r--r--libmsi/Makefile.am2
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index f7c60e5..899daf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AS_IF([test "$uuid" = yes],
LT_INIT([win32-dll disable-fast-install])
GOBJECT_INTROSPECTION_CHECK([0.9.4])
+AM_CONDITIONAL([GIR], [test "x$INTROSPECTION_MAKEFILE" != x])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am
index 9bfd503..d516584 100644
--- a/libmsi/Makefile.am
+++ b/libmsi/Makefile.am
@@ -41,6 +41,7 @@ libmsi_la_LIBADD = $(GLIB_LIBS) $(GSF_LIBS) $(GOBJECT_LIBS)
INTROSPECTION_SCANNER_ARGS = --warn-all
+if GIR
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS = Libmsi-1.0.gir
@@ -67,3 +68,4 @@ typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES = $(gir_DATA) $(typelib_DATA)
+endif