aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-01-17 22:53:41 +0800
committerDan Winship <danw@src.gnome.org>2008-01-17 22:53:41 +0800
commit8254ee63d40ea4b89db5131bed2ba81e49e8a267 (patch)
treef41bb27203b7347d2c7b2f65b124afded7690820
parent9dcaf525dc975c1d3bbc9505f62ba8d5c80e3764 (diff)
downloadgsoc2013-evolution-8254ee63d40ea4b89db5131bed2ba81e49e8a267.tar.gz
gsoc2013-evolution-8254ee63d40ea4b89db5131bed2ba81e49e8a267.tar.zst
gsoc2013-evolution-8254ee63d40ea4b89db5131bed2ba81e49e8a267.zip
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
-rw-r--r--ChangeLog7
-rw-r--r--configure.in11
2 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c3eddfa595..e5f72ca371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure.in b/configure.in
index 12d6eea62a..c59c2c9972 100644
--- a/configure.in
+++ b/configure.in
@@ -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)