diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-12-08 04:27:50 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-12-08 04:27:50 -0500 |
| commit | be69a42947c59dc9a047e3cb304e858db669bb95 (patch) | |
| tree | c3b66304300acb67f41ed8dd931df52a80c05560 /configure.ac | |
| parent | 853fe81d0bab3ba0011a6759026223e96013a762 (diff) | |
| parent | c05b64af5fc28789f404629d64a1ade4d6c6da34 (diff) | |
| download | libayatana-appindicator-be69a42947c59dc9a047e3cb304e858db669bb95.tar.gz libayatana-appindicator-be69a42947c59dc9a047e3cb304e858db669bb95.tar.bz2 libayatana-appindicator-be69a42947c59dc9a047e3cb304e858db669bb95.zip | |
* New upstream release.
* A race fix on the dbus name (LP: #526499)
* Fixing the Watcher Interface
* Fixes to build with GTK 2/3
* Fixes to build with valac-0.12
* debian/control
- Changed the valac build depends to valac-0.12
* debian/python-appindicator.install
- Make sure python2.6 and python2.7 files get included
* debian/rules
- Fix builds for multiple python versions
- disable parallel builds, it breaks the mono binding generation
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 0ecea51..a35ca6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.9, ted@canonical.com) +AC_INIT(indicator-application, 0.2.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.9) +AM_INIT_AUTOMAKE(indicator-application, 0.2.90) AM_MAINTAINER_MODE @@ -37,20 +37,40 @@ AC_CONFIG_MACRO_DIR(m4) # Dependencies ########################### -GTK_REQUIRED_VERSION=2.12 +GTK_REQUIRED_VERSION=2.18 +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) +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 @@ -191,6 +211,7 @@ AC_OUTPUT([ Makefile src/Makefile src/appindicator-0.1.pc +src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config @@ -217,4 +238,5 @@ Application Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR + GTK+ Version: $with_gtk ]) |