[gjs] configure: Improve cairo-gobject check, bug 694373

[David King <davidk src gnome org>]

commit cfd2d56786600b9e419cf2c26e1bf305e7cacc32
Author: David King <amigadave amigadave com>
Date:   Mon Feb 25 23:15:02 2013 +0000

    configure: Improve cairo-gobject check, bug 694373
    
    Add the _GI_DISABLE_CAIRO define to the gobject-introspection scanner
    flags for the Regress-1.0 GIR. Require cairo-gobject if cairo support is
    enabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694373

 Makefile-test.am |    2 +-
 configure.ac     |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 98b9fe3..08cf9ab 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -63,7 +63,7 @@ libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS)
 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)
+Regress_1_0_gir_SCANNERFLAGS = --warn-all --warn-error $(libregress_scannerflags_includes) 
$(libregress_la_CPPFLAGS)
 INTROSPECTION_GIRS += Regress-1.0.gir
 
 WarnLib-1.0.gir: libwarnlib.la
diff --git a/configure.ac b/configure.ac
index d1b86e1..771abd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,25 +96,20 @@ GOBJECT_INTROSPECTION_REQUIRE([1.33.10])
 
 common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs185"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
-gjs_cairo_gobject_packages="cairo-gobject $common_packages"
-gjs_cairo_packages="cairo $common_packages"
+gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gdbus_packages="gobject-2.0 >= glib_required_version gio-2.0"
 # gjs-tests links against everything
 gjstests_packages="$gjstests_packages $gjs_packages"
 
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= glib_required_version])
 PKG_CHECK_MODULES([GJS], [$gjs_packages])
-# Prefer cairo-gobject if we have it
 AC_ARG_WITH(cairo,
            AS_HELP_STRING([--without-cairo], [Use cairo @<:@default=yes@:>@]),
            [], [with_cairo=yes])
 AS_IF([test x$with_cairo = xyes], [
-  PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, 
have_cairo_gobject=no)
-  AS_IF([test x${have_cairo_gobject} != xyes], [
-    PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages])
+  PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages], have_cairo=yes, have_cairo=no)
   ])
-])
-AM_CONDITIONAL(ENABLE_CAIRO, test x$with_cairo = xyes)
+AM_CONDITIONAL(ENABLE_CAIRO, test x$have_cairo = xyes)
 PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_gdbus_packages])
 
 PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages])