diff options
| author | Chenthill Palanisamy <pchenthill@novell.com> | 2010-06-28 17:51:45 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchenthill@novell.com> | 2010-06-28 17:51:45 +0800 |
| commit | 9014d5d426464d6e7a56969ce0b93e087e100e89 (patch) | |
| tree | 9b2ea6554ebe2cb9ad7d63df8c7ceb2724cfb04e | |
| parent | cc29ff46ea0bd257c7be1c08e0c43c957a6f7edf (diff) | |
| download | gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar.gz gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar.bz2 gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar.lz gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar.xz gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.tar.zst gsoc2013-evolution-9014d5d426464d6e7a56969ce0b93e087e100e89.zip | |
use gtk-3.0 if available
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index bcaec4cbb1..75b1c474dc 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.22.0]) -m4_define([gtk_minimum_version], [2.20.0]) m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) @@ -51,6 +50,17 @@ m4_define([libpst_minimum_version], [0.6.41]) m4_define([unique_minimum_version], [1.1.2]) m4_define([dbus_glib_minimum_version], [0.74]) +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 + dnl Optional Packages m4_define([nm_minimum_version],[0.7]) m4_define([champlain_minimum_version], [0.4]) @@ -220,7 +230,7 @@ dnl ********************************** PKG_CHECK_MODULES([GNOME_PLATFORM], [glib-2.0 >= glib_minimum_version gthread-2.0 >= glib_minimum_version - gtk+-2.0 >= gtk_minimum_version + $GTK_PACKAGE >= $gtk_minimum_version gail >= gail_minimum_version gconf-2.0 >= gconf_minimum_version libxml-2.0 >= libxml_minimum_version |