diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-07-11 11:58:39 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-07-11 11:58:39 +0100 |
| commit | 1b43dcb34eab345b4046258c478c02e536cf44d8 (patch) | |
| tree | fa061ab29fa5809ffe08713c21ff78de5c9b1887 /configure.ac | |
| parent | 4f535763d9e05e41c81b1a8fbf262aea1246f616 (diff) | |
| parent | 331ab6a0abc53276af8da99ea141071bbb605820 (diff) | |
| download | ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.tar.gz ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.tar.bz2 ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.zip | |
merged trunk to keep up with changes
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 5b724e2..4f2cb04 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.90) +AM_INIT_AUTOMAKE(indicator-session, 0.2.92) AM_MAINTAINER_MODE @@ -39,12 +39,12 @@ AC_ARG_WITH([indicator-gtk], AS_IF([test "x$with_indicator_gtk" = x3], [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) ], [test "x$with_indicator_gtk" = x2], [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])] @@ -58,7 +58,7 @@ PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VE dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION dbus-glib-1 gio-unix-2.0 - indicator3 >= $INDICATOR_REQUIRED_VERSION) + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) @@ -95,11 +95,11 @@ if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/indicator-applet/icons/" elif test "x$with_indicator_gtk" = x2; then - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) |