[banshee/gio-hardware] Show the right min versions in configure summary



commit 98f5a57544898811ea4bd1eefcb11f7a1f079975
Author: Aaron Bockover <abockover novell com>
Date:   Mon Jul 19 13:15:03 2010 -0400

    Show the right min versions in configure summary

 build/m4/banshee/libwebkit.m4 |   11 +++++++++--
 configure.ac                  |    4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
index d531276..656762f 100644
--- a/build/m4/banshee/libwebkit.m4
+++ b/build/m4/banshee/libwebkit.m4
@@ -1,14 +1,21 @@
 AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
 [
+	WEBKIT_MIN_VERSION=1.2.2
+	SOUP_MIN_VERSION=2.26
+	SOUP_GNOME_MIN_VERSION=2.26
+
 	have_libwebkit=no
-	PKG_CHECK_MODULES(LIBWEBKIT, webkit-1.0 >= 1.2.2 libsoup-2.4 >= 2.26,
+	PKG_CHECK_MODULES(LIBWEBKIT,
+		webkit-1.0 >= $WEBKIT_MIN_VERSION
+		libsoup-2.4 >= $SOUP_MIN_VERSION,
 		have_libwebkit=yes, have_libwebkit=no)
 	AC_SUBST(LIBWEBKIT_LIBS)
 	AC_SUBST(LIBWEBKIT_CFLAGS)
 	AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
 
 	have_libsoup_gnome=no
-	PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26,
+	PKG_CHECK_MODULES(LIBSOUP_GNOME,
+		libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
 		have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
 	AC_SUBST(LIBSOUP_GNOME_LIBS)
 	AC_SUBST(LIBSOUP_GNOME_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 54148f9..5909ad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,8 +400,8 @@ ${PACKAGE}-${VERSION}
     Karma:             ${enable_karmasharp}
 
   Extra Features:
-    Web Browser:       ${have_libwebkit} (webkit-1.0 >= 1.2.0, libsoup-2.4 >= 2.26)
-      + GNOME Proxy    ${have_libsoup_gnome} (libsoup-gnome-2.4 >= 2.26)
+    Web Browser:       ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
+      + GNOME Proxy    ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
       + Amazon MP3     ${have_libwebkit}
       + Miro Guide     ${have_libwebkit}
       + Wikipedia      ${have_libwebkit}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]