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

[Dan Williams <dcbw src gnome org>]

commit e158c5831b1fb6e9d7670327a3ec71f46fa308ea
Author: Dan Williams <dcbw redhat com>
Date:   Wed Aug 17 16:41:34 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 |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 901c267..d200cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,14 +91,19 @@ PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
 AC_SUBST(NOTIFY_CFLAGS)
 AC_SUBST(NOTIFY_LIBS)
 
+gtk2_req=2.20
+gtk3_req=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)
+            with_gtkver="$withval",with_gtkver=0)
 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)
           ;;
-       *) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.4)
-          gtkver=3
+       3) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $gtk3_req)
+          ;;
+       *) AC_MSG_ERROR(unknown GTK+ version $with_gtkver!)
           ;;
 esac
 AC_SUBST(GTK_CFLAGS)
@@ -175,5 +180,3 @@ po/Makefile.in
 ])
 AC_OUTPUT
 
-echo Building for GTK+ version: ${gtkver}
-