evolution r34845 - trunk

[danw svn gnome org]

Author: danw
Date: Thu Jan 17 14:53:41 2008
New Revision: 34845
URL: http://svn.gnome.org/viewvc/evolution?rev=34845&view=rev

Log:
	* configure.in: Require libsoup-2.4. (Remove old "either 2.2 or
	2.4" support, which only ever worked because there was an old CVS
	version of libsoup that claimed to be 2.4 but still had the 2.2
	API.)


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 17 14:53:41 2008
@@ -1519,16 +1519,7 @@
 AC_SUBST(LIBNOTIFY_LIBS)
 
 dnl --- evolution-calendar flags
-PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
-if test $have_libsoup_24 = yes; then
-    LIBSOUP_REQUIRED=2.3.0
-    LIBSOUP=libsoup-2.4
-else
-    LIBSOUP_REQUIRED=2.2.2
-    LIBSOUP=libsoup-2.2
-fi
-
-EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
+EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)