diff options
author | Ted Gould <ted@gould.cx> | 2011-06-22 11:31:59 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-06-22 11:31:59 -0500 |
commit | 3eea1be84b1c47bdf682c25a80851a4cacec4bd2 (patch) | |
tree | dfa63fa569d4580659d9fa83f5bf1845573278ef /configure.ac | |
parent | b8ece12c8057d848a5b502bf659dddb6fe59fcd9 (diff) | |
parent | 58779f7506601ca54d4fffcee79c6a0172f3f4ce (diff) | |
download | ayatana-indicator-application-3eea1be84b1c47bdf682c25a80851a4cacec4bd2.tar.gz ayatana-indicator-application-3eea1be84b1c47bdf682c25a80851a4cacec4bd2.tar.bz2 ayatana-indicator-application-3eea1be84b1c47bdf682c25a80851a4cacec4bd2.zip |
Import upstream version 0.3.90
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index d29a293..9b550aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.3.2, ted@canonical.com) +AC_INIT(indicator-application, 0.3.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.3.2) +AM_INIT_AUTOMAKE(indicator-application, 0.3.90) AM_MAINTAINER_MODE @@ -37,11 +37,13 @@ DBUSMENUGTK_REQUIRED_VERSION=0.3.91 JSON_GLIB_REQUIRED_VERSION=0.7.6 DBUS_GLIB_REQUIRED_VERSION=0.82 +LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 + AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=2@:>@])], + [Which version of gtk to use @<:@default=3@:>@])], [], - [with_gtk=2]) + [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION @@ -49,8 +51,9 @@ AS_IF([test "x$with_gtk" = x3], json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + + PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], @@ -60,24 +63,19 @@ AS_IF([test "x$with_gtk" = x3], json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + + PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) -LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 - -PKG_CHECK_MODULES(TEST, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) - -AC_SUBST(TEST_CFLAGS) -AC_SUBST(TEST_LIBS) +AC_SUBST(INDICATOR_CFLAGS) +AC_SUBST(INDICATOR_LIBS) -APP_INDICATOR_INCLUDE_BASE=`$PKG_CONFIG --variable=includedir appindicator-0.1` -APP_INDICATOR_INCLUDE="$APP_INDICATOR_INCLUDE_BASE/libappindicator-0.1/" +AC_SUBST(APPINDICATOR_CFLAGS) +AC_SUBST(APPINDICATOR_LIBS) -AC_SUBST(APP_INDICATOR_INCLUDE) ########################### # Check to see if we're local @@ -93,9 +91,12 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/libindicate/icons/" -else +elif test "x$with_gtk" = x2; then INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) |