From 7d6fd708fb7cd6b23b42e6fdd523157b76c36501 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 29 Mar 2011 14:45:34 +0100 Subject: [PATCH] Stop overriding pkg-config's nice informative message if GLib is too old This means that instead of this rather ambiguous text: checking for DBUS_GLIB... no checking for DBUS_GLIB_THREADS... yes configure: error: GLib development libraries not found platforms whose GLib is too old will get the conventional output: checking for DBUS_GLIB... no configure: error: Package requirements (gobject-2.0 >= 2.26) were not met: Requested 'gobject-2.0 >= 2.26' but version of GObject is 2.24.0 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33145 --- configure.ac | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 761d635..61522e5 100644 --- a/configure.ac +++ b/configure.ac @@ -385,13 +385,9 @@ fi AC_SUBST(DBUS_DAEMONDIR) # Glib detection -PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.26, have_glib=yes, have_glib=no) +PKG_CHECK_MODULES([DBUS_GLIB], [gobject-2.0 >= 2.26]) PKG_CHECK_MODULES(DBUS_GLIB_THREADS, gthread-2.0 >= 2.6, have_glib_threads=yes, have_glib_threads=no) -if test x$have_glib = xno ; then - AC_MSG_ERROR([GLib development libraries not found]) -fi - AM_CONDITIONAL(HAVE_GLIB, test x$have_glib = xyes) AM_CONDITIONAL(HAVE_GLIB_THREADS, test x$have_glib_threads = xyes) -- 1.7.4.1