From 3551eb170dd87fbe11148136813e1bb580b90604 Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Wed, 6 Oct 2010 12:08:49 -0400
Subject: instead of always building gtk2 and gtk3, add a --with-gtk= flag to
 configure to specify which to build with

---
 configure.ac | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 42b545e..4abdd9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,29 +38,39 @@ AC_CONFIG_MACRO_DIR(m4)
 ###########################
 
 GTK_REQUIRED_VERSION=2.18
-GTK3_REQUIRED_VERSION=2.90
+GTK3_REQUIRED_VERSION=2.91
 INDICATOR_REQUIRED_VERSION=0.3.5
 DBUSMENUGTK_REQUIRED_VERSION=0.2.2
 JSON_GLIB_REQUIRED_VERSION=0.7.6
 DBUS_GLIB_REQUIRED_VERSION=0.82
 
-PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                             indicator >= $INDICATOR_REQUIRED_VERSION
-                             json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                             dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                             dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
-
-AC_SUBST(INDICATOR_CFLAGS)
-AC_SUBST(INDICATOR_LIBS)
-
-PKG_CHECK_MODULES(INDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                              indicator3 >= $INDICATOR_REQUIRED_VERSION
-                              json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                              dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                              dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION)
-
-AC_SUBST(INDICATOR3_CFLAGS)
-AC_SUBST(INDICATOR3_LIBS)
+AC_ARG_WITH([gtk],
+  [AS_HELP_STRING([--with-gtk],
+    [Which version of gtk to use @<:@default=2@:>@])],
+  [],
+  [with_gtk=2])
+AS_IF([test "x$with_gtk" = x3],
+        [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION)
+         AC_SUBST(INDICATOR_CFLAGS)
+         AC_SUBST(INDICATOR_LIBS)
+         AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
+        ],
+      [test "x$with_gtk" = x2],
+        [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                       indicator >= $INDICATOR_REQUIRED_VERSION 
+                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
+                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+         AC_SUBST(INDICATOR_CFLAGS)
+         AC_SUBST(INDICATOR_LIBS)
+        ],
+      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
+)
+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
 
 ###########################
 # GObject Introspection
@@ -228,4 +238,5 @@ Application Indicator Configuration:
 
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
+	GTK+ Version:  $with_gtk
 ])
-- 
cgit v1.2.3