aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2005-05-12 18:21:05 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2005-05-12 18:21:05 +0800
commit1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e (patch)
tree3395e4cc068e85b1984073de5ac9fddba8669d64
parent2ce0d286128d1cd5b8901761fd9986f7c39d5611 (diff)
downloadgsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar.gz
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar.bz2
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar.lz
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar.xz
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.tar.zst
gsoc2013-evolution-1490bc7b4b2224e5a79cf6fe2c3fe9458c45228e.zip
check for libsoup-2.4 else fail over to libsoup-2.2.
2005-05-12 Harish Krishnaswamy <kharish@novell.com> * configure.in: check for libsoup-2.4 else fail over to libsoup-2.2. svn path=/trunk/; revision=29335
-rw-r--r--ChangeLog5
-rw-r--r--configure.in11
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac89097c01..377928c08f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12 Harish Krishnaswamy <kharish@novell.com>
+
+ * configure.in: check for libsoup-2.4 else fail over
+ to libsoup-2.2.
+
2005-05-06 Not Zed <NotZed@Ximian.com>
* plugin.mk: changed .eplug rule to also convert i18n tags if it
diff --git a/configure.in b/configure.in
index a70e820e22..a3dde3d258 100644
--- a/configure.in
+++ b/configure.in
@@ -1198,7 +1198,16 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
fi
dnl --- evolution-calendar flags
-EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.2.2)
+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)
AC_SUBST(LIBSOUP_CFLAGS)
AC_SUBST(LIBSOUP_LIBS)