summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-09-01 18:47:16 +0200
committerBenjamin Otte <otte@redhat.com>2010-09-01 18:47:16 +0200
commit54a651564cdd2510d0a66f6720c4a45733ff3285 (patch)
treeee18d001264e6745586fb1ff1fa4be4c3b294a04
parent28ba78a9716f3c105cdfb5f7519f2435dd9cb271 (diff)
build: Work around caching not reevaluating uncached variables
This is a somewhat crude hack to ensure that GOBJECT_CFLAGS/LIBS are properly cached.
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index a8b0f9b95..47d2b99fd 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