summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2014-05-02 17:34:25 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2014-05-02 17:34:25 -0400
commitc6e0ef5b7cae8ac9d6cc79c54dded79869e5346e (patch)
tree45154f7a8730416d5f1efca77017fd292da75a98
parentd7649bd15ec14dc23486da18a6bcef81bc9ae39a (diff)
downloadgjs-c6e0ef5b7cae8ac9d6cc79c54dded79869e5346e.tar.gz
Fix building Regress-1.0.gir with cairo disabled
We need to define GI_DISABLE_CAIRO when scanning to create the GIR, not just when compiling the library, otherwise we'll fail because cairo-gobject.h is not found.
-rw-r--r--Makefile-insttest.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index b4f8d17f..59d76e9f 100644
--- a/Makefile-insttest.am
+++ b/Makefile-insttest.am
@@ -69,6 +69,9 @@ Regress-1.0.gir: libregress.la
Regress_1_0_gir_LIBS = libregress.la
Regress_1_0_gir_FILES = $(nodist_libregress_la_SOURCES)
Regress_1_0_gir_SCANNERFLAGS = --warn-all --warn-error $(libregress_scannerflags_includes)
+if !ENABLE_CAIRO
+Regress_1_0_gir_CFLAGS = -D_GI_DISABLE_CAIRO
+endif
TEST_INTROSPECTION_GIRS += Regress-1.0.gir
WarnLib-1.0.gir: libwarnlib.la