[gnome-keyring/gnome-3-0] Build with GTK+3 by default.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/gnome-3-0] Build with GTK+3 by default.
- Date: Sun, 24 Apr 2011 09:13:14 +0000 (UTC)
commit 1746971a616aa822c08992ac59a2d38e75197f47
Author: Stef Walter <stefw collabora co uk>
Date: Sun Apr 24 11:07:12 2011 +0200
Build with GTK+3 by default.
* Accept arguments like --with-gtk=2 and --with-gtk=3 instead
of strict --with-gtk=3.0.
configure.in | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index 63403f1..9f0f75d 100644
--- a/configure.in
+++ b/configure.in
@@ -87,26 +87,28 @@ AC_SUBST(GIO_LIBS)
AC_MSG_CHECKING([which GTK+ version to compile against])
AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk=2.0|3.0],[which GTK+ version to compile against (default: 2.0)])],
+ [AS_HELP_STRING([--with-gtk=2|3],[which GTK+ version to compile against (default: 3)])],
[case "$with_gtk" in
- 2.0|3.0) ;;
+ 2*|3*) ;;
*) AC_MSG_ERROR([invalid GTK+ version specified]) ;;
esac],
- [with_gtk=2.0])
+ [with_gtk=3])
AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
- 2.0)
+ 2*)
GCR_MAJOR=$GCR_MAJOR_GTK2
GCR_VERSION_SUFFIX=
GTK_API_VERSION=2.0
GTK_REQUIRED=2.20.0
+ with_gtk=2.0
;;
- 3.0)
+ 3*)
GCR_MAJOR=$GCR_MAJOR_GTK3
GCR_VERSION_SUFFIX=-$GCR_MAJOR
GTK_API_VERSION=3.0
GTK_REQUIRED=2.90.0
+ with_gtk=3.0
;;
esac
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]