[network-manager-vpnc] build: enhance GTK version choice at configure time
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc] build: enhance GTK version choice at configure time
- Date: Fri, 18 Feb 2011 21:23:34 +0000 (UTC)
commit 9da3682bd0359ddae0ceb8ddbde800606e9a2552
Author: Dan Williams <dcbw redhat com>
Date: Fri Feb 18 15:23:14 2011 -0600
build: enhance GTK version choice at configure time
Make the choice automatic if not overridden by the configure
arguments.
configure.ac | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d4a7aa7..97876c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,17 +66,16 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
if test x"$with_gnome" != xno; then
- AC_ARG_WITH([gtk2], AS_HELP_STRING([--with-gtk2], [Use GTK+ 2.x instead of GTK+ 3.x]),
- with_gtk2="$withval",with_gtk2=no)
- gtkver=3
- case "${with_gtk2}" in
- yes) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20)
- gtkver=2
- ;;
- *) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.4)
- ;;
+ AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
+ with_gtkver="$withval",with_gtkver=3)
+ case "${with_gtkver}" in
+ 2) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20)
+ gtkver=2
+ ;;
+ *) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.4)
+ gtkver=3
+ ;;
esac
- AM_CONDITIONAL(USE_GTK2, test x"$gtkver" = "x2")
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]