Clarify in configure output that we require 0.6 <= gee <= 0.8.
authorTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 13 Oct 2011 17:48:51 +0000 (10:48 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 13 Oct 2011 17:48:51 +0000 (10:48 -0700)
Closes: bgo#660937 - [regression] build failure: No package 'gee-1.0' found

NEWS
configure.ac

diff --git a/NEWS b/NEWS
index 79cdc36..8cd7e31 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Bugs fixed:
   VALA_CHECK_PACKAGES([tracker-sparql-0.12])
 * Bug 657602 — Telepathy backend fails to set Personas' phone numbers from
   ContactInfo
+* Bug 660937 — [regression] build failure: No package 'gee-1.0' found
 
 API changes:
 * Implement PhoneDetails on Tpf.Persona
index 879ca90..a51f2d9 100644 (file)
@@ -145,7 +145,18 @@ PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1])
 PKG_CHECK_MODULES([GCONF2], [gconf-2.0 >= $GCONF2_REQUIRED])
 
 # FIXME: We depend on libgee < 0.7 because 0.7 breaks API. bgo#627746
-PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7])
+PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7],
+                  have_gee_0_6_x="yes",
+                  have_gee_0_6_x="no")
+
+if test "x$have_gee_0_6_x" != "xyes"; then
+    AC_MSG_ERROR([
+Gee 0.6.x required but not installed.
+
+Note that Gee 0.8.x provides gee-0.8 (but gee-1.0 is, confusingly, provided by
+Gee 0.6.x)])
+fi
+
 PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])
 
 if test x$enable_tracker_backend = xyes; then