[network-manager-openvpn] build: fix handling of GTK requirement if none was given

[Dan Williams <dcbw src gnome org>]

commit 92b8541817c64a4418399dea24f0583f4c3f1dfa
Author: Dan Williams <dcbw redhat com>
Date:   Wed Aug 17 16:24:22 2011 -0500

    build: fix handling of GTK requirement if none was given
    
    Previously the logic defaulted to requiring GTK3, but that broke
    when doing 'make distcheck' if you didn't have GTK3.  So if the
    user didn't give a specific GTK version, just pick one
    automatically.

 configure.ac |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f4708f3..82cb48b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,13 +75,19 @@ AC_SUBST(NM_LIBS)
 
 if test x"$with_gnome" != xno; then
 	AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
-	            with_gtkver="$withval",with_gtkver=3)
+	            with_gtkver="$withval",with_gtkver=0)
+
+	gtk2_req=2.20
+	gtk3_req=2.91.4
 	case "${with_gtkver}" in
-	       2) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20)
-	          gtkver=2
+	       0) PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, ,
+	                            [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)])
+		  ;;
+	       2) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $gtk2_req)
+	          ;;
+	       3) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $gtk3_req)
 	          ;;
-	       *) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.4)
-	          gtkver=3
+	       *) AC_MSG_ERROR(unknown GTK+ version $with_gtkver!)
 	          ;;
 	esac
 	AC_SUBST(GTK_CFLAGS)