[evolution-mapi] Drop the --enable-gtk3 configure option.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Drop the --enable-gtk3 configure option.
- Date: Wed, 26 Jan 2011 18:10:30 +0000 (UTC)
commit 9e588cc4c1bd56ebda1f21a76cadbccb7fcb0355
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Jan 26 13:09:53 2011 -0500
Drop the --enable-gtk3 configure option.
Also require the very latest gtk+-3.0 release until 3.0.
configure.ac | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e2b78c8..957d6d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,35 +29,9 @@ m4_define([eds_minimum_version], [ema_version])
m4_define([evo_minimum_version], [ema_version])
m4_define([libmapi_minimum_version], [0.9])
m4_define([glib_minimum_version], [2.16.1])
+m4_define([gtk_minimum_version], [2.99.2])
m4_define([gconf_minimum_version], [2.0.0])
-dnl **********************************
-dnl Gtk-3 compatibility
-dnl Use the API version 3.0 while compiling with gtk+-3
-dnl **********************************
-AC_ARG_ENABLE([gtk3],
- AS_HELP_STRING([--enable-gtk3],
- [Attempt to use gtk+-3]),
- [enable_gtk3=$enableval],[enable_gtk3=no])
-
-if test "x${enable_gtk3}" = "xyes"; then
- LIBEDATASERVER_UI_API_VERSION=3.0
- GTK_PACKAGE="gtk+-3.0"
- EVO_PLUGIN_PACKAGE="evolution-plugin-3.0"
- gtk_minimum_version="2.90.4"
- gweather_minimum_version="2.90.0"
-else
- LIBEDATASERVER_UI_API_VERSION=1.2
- GTK_PACKAGE="gtk+-2.0"
- EVO_PLUGIN_PACKAGE="evolution-plugin"
- gtk_minimum_version="2.20.0"
- gweather_minimum_version="2.25.4"
-fi
-
-AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
-GTK_MODULE="$GTK_PACKAGE >= $gtk_minimum_version"
-AC_SUBST(GTK_MODULE)
-
dnl ***********************************
dnl Automake 1.11 - Silent Build Rules
dnl ***********************************
@@ -135,7 +109,7 @@ dnl Check for GNOME Platform
dnl *****************************
PKG_CHECK_MODULES(GNOME_PLATFORM,
[glib-2.0 >= glib_minimum_version
- $GTK_MODULE
+ gtk+-3.0 >= gtk_minimum_version
gconf-2.0 >= gconf_minimum_version])
dnl ********************************
@@ -153,7 +127,7 @@ PKG_CHECK_MODULES(CAMEL, camel-provider-$EDS_PACKAGE >= eds_minimum_version)
dnl ****************************
dnl Check for evolution plugins
dnl ****************************
-PKG_CHECK_MODULES(EVOLUTION_PLUGIN, $EVO_PLUGIN_PACKAGE >= evo_minimum_version)
+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin-3.0 >= evo_minimum_version)
dnl ****************************
dnl Check for LibMAPI
@@ -292,7 +266,7 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
dnl *******************
dnl Special directories
dnl *******************
-plugindir=`$PKG_CONFIG --variable=plugindir $EVO_PLUGIN_PACKAGE`
+plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-3.0`
AC_SUBST(plugindir)
ebook_backenddir=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]