From 986d72d9de055a4871e5a213bac5c022ddfd6c49 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 15 Apr 2011 09:39:13 -0400 Subject: [PATCH] configure: remove support for evolution-data-server 1.2 https://bugzilla.gnome.org/show_bug.cgi?id=647395 --- configure.ac | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 31d565c77..e68bf957a 100644 --- a/configure.ac +++ b/configure.ac @@ -68,8 +68,7 @@ GTK_MIN_VERSION=3.0.0 GIO_MIN_VERSION=2.25.9 LIBECAL_MIN_VERSION=2.32.0 LIBEDATASERVER_MIN_VERSION=1.2.0 -LIBEDATASERVERUI2_MIN_VERSION=1.2.0 -LIBEDATASERVERUI3_MIN_VERSION=2.91.6 +LIBEDATASERVERUI_MIN_VERSION=2.91.6 TELEPATHY_GLIB_MIN_VERSION=0.13.12 TELEPATHY_LOGGER_MIN_VERSION=0.2.4 POLKIT_MIN_VERSION=0.100 @@ -135,13 +134,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0], AC_SUBST([HAVE_BLUETOOTH],[0]) AC_MSG_RESULT([no])]) -# Default to libedataserverui-3.0, but allow falling back to 1.2 -PKG_CHECK_EXISTS(libedataserverui-3.0, - [EDS_API=3.0 - LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI3_MIN_VERSION], - [EDS_API=1.2 - LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI2_MIN_VERSION]) -PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-$EDS_API >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) +PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) AC_SUBST(CALENDAR_SERVER_CFLAGS) AC_SUBST(CALENDAR_SERVER_LIBS)