aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-02 16:40:51 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-02 16:40:51 +0800
commitf8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46 (patch)
tree40e41d7e4cc65c23c3cf4e9a9bab53217cd27ad2
parentf77a8afd5d85a230b743d97e12ed069a0309b660 (diff)
downloadgsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar.gz
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar.bz2
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar.lz
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar.xz
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.tar.zst
gsoc2013-empathy-f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46.zip
Check for the right version of CC depending on GTK+
gnome-control-center has been ported to GTK+3 in 2.31.4
-rw-r--r--configure.ac13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 7d735187d..f9d6d41a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ NAUTILUS_SENDTO_REQUIRED=2.28.1
NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
WEBKIT_REQUIRED=1.1.15
+GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
# Use --enable-maintainer-mode to disable deprecated symbols,
# disable single include and enable GSEAL. If this is not a released empathy,
@@ -478,10 +479,14 @@ AC_ARG_ENABLE(control_center_embedding,
, enable_control_center_embedding=auto)
if test "x$enable_control_center_embedding" != "xno"; then
- PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING,
- [
- libgnome-control-center
- ], have_control_center_embedding="yes", have_control_center_embedding="no")
+
+ if test "x$have_gtk3" == "xno"; then
+ PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED],
+ have_control_center_embedding="yes", have_control_center_embedding="no")
+ else
+ PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_GTK3_REQUIRED],
+ have_control_center_embedding="yes", have_control_center_embedding="no")
+ fi
if test "x$have_control_center_embedding" = "xyes"; then
AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])