[evolution-data-server] use gtk-3.0 if available
- From: Chenthill Palanisamy <pchen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] use gtk-3.0 if available
- Date: Mon, 28 Jun 2010 09:54:16 +0000 (UTC)
commit aa443fa9f909208564aa58f41c8f7f7277f08554
Author: Chenthill Palanisamy <pchenthill novell com>
Date: Mon Jun 28 15:21:13 2010 +0530
use gtk-3.0 if available
configure.ac | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f8a1390..96f1059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Required Package Versions
m4_define([glib_minimum_version], [2.16.1])
-m4_define([gtk_minimum_version], [2.20.0])
m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libxml_minimum_version], [2.0.0]) dnl XXX Just a Guess
m4_define([libsoup_minimum_version], [2.3.0])
@@ -44,6 +43,17 @@ m4_define([gweather_minimum_version], [2.25.4])
m4_define([libical_minimum_version], [0.43])
m4_define([dbus_glib_minimum_version], [0.6])
+dnl **********************************
+dnl GTK version
+dnl **********************************
+if $PKG_CONFIG --exists gtk+-3.0; then
+ GTK_PACKAGE="gtk+-3.0"
+ gtk_minimum_version="2.90.5"
+else
+ GTK_PACKAGE="gtk+-2.0"
+ gtk_minimum_version="2.20.0"
+fi
+
AC_SUBST([BASE_VERSION],[base_version])
AC_SUBST([API_VERSION],[api_version])
AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)])
@@ -279,7 +289,7 @@ dnl Check for base dependencies early.
dnl ***********************************
PKG_CHECK_MODULES(GNOME_PLATFORM,
[glib-2.0 >= glib_minimum_version
- gtk+-2.0 >= gtk_minimum_version
+ $GTK_PACKAGE >= $gtk_minimum_version
gconf-2.0 >= gconf_minimum_version
libxml-2.0 >= libxml_minimum_version
libsoup-2.4 >= libsoup_minimum_version
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]