diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-29 14:45:34 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-05 18:10:21 +0100 |
| commit | 0f782b478a784ac890741e5d84fd741a26d49510 (patch) | |
| tree | 72ec4c58ecdf955a162b6fd841aa47a40d064cf4 | |
| parent | ab2a98bd3ae0c59f198e82cba2c81095a47fa58d (diff) | |
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
Reviewed-by: Colin Walters <walters@verbum.org>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 91d3e5d..7ea6a63 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) |