Require libsoup-2.4. (Remove old "either 2.2 or 2.4" support, which only

* 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.)

svn path=/trunk/; revision=34845
This commit is contained in:
Dan Winship
2008-01-17 14:53:41 +00:00
parent 9dcaf525dc
commit 8254ee63d4
2 changed files with 8 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2008-01-15 Dan Winship <danw@gnome.org>
* 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.)
2008-01-14 Srinivasa Ragavan <sragavan@novell.com>
* configure.in: Version bump to 2.21.90

View File

@ -1519,16 +1519,7 @@ AC_SUBST(LIBNOTIFY_CFLAGS)
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)