Clean up cairo handling somewhat

I'm building on RHEL6 which doesn't have cairo-gobject.  Now, we
tried to support this in that 'make' would succeed, but 'make check'
would blow up.

This patch allows more of 'make check' to succeed - I just need to
figure out how to make the diff against the -expected.gir work.

What's more important though, is this will allow gjs to also #define
_GI_DISABLE_CAIRO.

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index d8a3002e..f243a14c 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -1,7 +1,9 @@
 #ifndef __GITESTTYPES_H__
 #define __GITESTTYPES_H__
 
-#include <cairo.h>
+#ifndef _GI_DISABLE_CAIRO
+#include <cairo-gobject.h>
+#endif
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <time.h>
@@ -129,6 +131,7 @@ int regress_test_int_value_arg(const GValue *v);
 const GValue *regress_test_value_return(int i);
 
 /* foreign structs */
+#ifndef _GI_DISABLE_CAIRO
 cairo_t *regress_test_cairo_context_full_return (void);
 void regress_test_cairo_context_none_in (cairo_t *context);
 
@@ -136,6 +139,7 @@ cairo_surface_t *regress_test_cairo_surface_none_return (void);
 cairo_surface_t *regress_test_cairo_surface_full_return (void);
 void regress_test_cairo_surface_none_in (cairo_surface_t *surface);
 void regress_test_cairo_surface_full_out (cairo_surface_t **surface);
+#endif
 
 /* versioning (deprecated, since, stability) */
 void regress_test_versioning (void);