[seahorse] configure: Define the max allowed version of GTK we want to use
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] configure: Define the max allowed version of GTK we want to use
- Date: Wed, 8 Jan 2014 11:39:01 +0000 (UTC)
commit fd0bd6caeecc03361b55c9e1aae8ebebc2c6d2aa
Author: Stef Walter <stefw gnome org>
Date: Wed Jan 8 11:43:08 2014 +0100
configure: Define the max allowed version of GTK we want to use
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e055c25..222b9c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,10 @@ AC_INIT([seahorse], [3.10.1],
GCK_REQUIRED=3.3.4
GCR_REQUIRED=3.9.1
-GTK_REQUIRED=3.4.0
+
+GTK_REQ=3.4.0
+GTK_MAX=GTK_VERSION_3_4
+
GNUPG_ACCEPTED="1.2 1.4 2.0"
GPGME_REQUIRED=1.0.0
LIBSECRET_REQUIRED=0.16
@@ -72,12 +75,13 @@ LDFLAGS="$LDFLAGS $CODE_COVERAGE_LDFLAGS"
# -----------------------------------------------------------------------------
# Basic Dependencies
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQ)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED)
+PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQ gcr-3 >= $GCR_REQUIRED)
SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE"
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS -DGTK_VERSION_MAX_ALLOWED=$GTK_MAX"
# User documentation
YELP_HELP_INIT
@@ -86,7 +90,7 @@ GLIB_GSETTINGS
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-PKG_CHECK_MODULES(EGG, gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(EGG, gtk+-3.0 >= $GTK_REQ)
AC_SUBST(EGG_LIBS)
AC_SUBST(EGG_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]