[network-manager-openvpn] build: enhance GTK version choice at configure time

[Dan Williams <dcbw src gnome org>]

commit f4cf8d1a034d59dcac73594b42fc286f16be7868
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 18 15:25:04 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 32253b3..7df441e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,17 +74,16 @@ AC_SUBST(NETWORK_MANAGER_CFLAGS)
 AC_SUBST(NETWORK_MANAGER_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)