[cairo-commit] 2 commits - configure.ac

[Benjamin Otte]

 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 54a651564cdd2510d0a66f6720c4a45733ff3285
Author: Benjamin Otte <otte at redhat.com>
Date:   Wed Sep 1 18:47:16 2010 +0200

    build: Work around caching not reevaluating uncached variables
    
    This is a somewhat crude hack to ensure that GOBJECT_CFLAGS/LIBS are
    properly cached.

diff --git a/configure.ac b/configure.ac
index a8b0f9b..47d2b99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,6 +660,10 @@ CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [
   use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"])
   gobject_NONPKGCONFIG_EXTRA_LIBS="-L\${libdir} -lcairo-gobject"
 ])
+dnl I'm too lazy to fix the caching properly
+if test "x$use_gobject" = "xyes"; then
+  PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES)
+fi
 
 dnl ===========================================================================
 dnl Default to quick testing during development, but force a full test before
commit 28ba78a9716f3c105cdfb5f7519f2435dd9cb271
Author: Benjamin Otte <otte at redhat.com>
Date:   Wed Sep 1 18:46:46 2010 +0200

    gobject: Fix pkgconfig file variable
    
    I confused % and $. I blame it on spec files.

diff --git a/configure.ac b/configure.ac
index beaad9d..a8b0f9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,7 +658,7 @@ CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [
   gobject_REQUIRES="gobject-2.0 glib-2.0"
   PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES, , [AC_MSG_RESULT(no)
   use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"])
-  gobject_NONPKGCONFIG_EXTRA_LIBS="-L\%{libdir} -lcairo-gobject"
+  gobject_NONPKGCONFIG_EXTRA_LIBS="-L\${libdir} -lcairo-gobject"
 ])
 
 dnl ===========================================================================