[gjs] cairo: Use cairo-gobject if available

[Colin Walters <walters src gnome org>]

commit c1b81ab9db3897d8d03de7f56f8f545c15ce2795
Author: Colin Walters <walters verbum org>
Date:   Mon Dec 6 11:04:23 2010 -0500

    cairo: Use cairo-gobject if available
    
    This lets us find the cairo boxed types; see commit
    0c6a98b69fb9b437c21fdef53bd719ca9d2f3f92 in gobject-introspection.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=636619

 configure.ac |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8950b57..9d3f829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,6 +195,7 @@ AC_SUBST([JS_EXTRA_CFLAGS])
 common_packages="gobject-2.0 >= gobject_required_version $JS_PACKAGE"
 gjs_packages="gmodule-2.0 gthread-2.0 $common_packages"
 gjs_gi_packages="gobject-introspection-1.0 >= 0.9.5 $common_packages"
+gjs_cairo_gobject_packages="cairo-gobject $common_packages"
 gjs_cairo_packages="cairo $common_packages"
 gjs_dbus_packages="dbus-glib-1 $common_packages"
 # gjs-tests links against everything
@@ -203,7 +204,11 @@ gjstests_packages="$gjstests_packages $gjs_packages"
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= gobject_required_version])
 PKG_CHECK_MODULES([GJS], [$gjs_packages])
 PKG_CHECK_MODULES([GJS_GI], [$gjs_gi_packages])
-PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages])
+# Prefer cairo-gobject if we have it
+PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, have_cairo_gobject=no)
+if test x${have_cairo_gobject} != xyes; then
+  PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages])
+fi
 PKG_CHECK_MODULES([GJS_DBUS], [$gjs_dbus_packages])
 saved_CFLAGS=$CFLAGS
 CFLAGS=$GJS_DBUS_CFLAGS