[gjs] Fix building Regress-1.0.gir with cairo disabled
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] Fix building Regress-1.0.gir with cairo disabled
- Date: Fri, 2 May 2014 21:36:53 +0000 (UTC)
commit c6e0ef5b7cae8ac9d6cc79c54dded79869e5346e
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Fri May 2 17:34:25 2014 -0400
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.
Makefile-insttest.am | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index b4f8d17..59d76e9 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]