diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-08 09:58:13 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-08 09:58:13 -0400 |
| commit | 502f3f9dc58ddbe9ccae645d5e29fb0e7c09a65d (patch) | |
| tree | 67464f18f0a256fe31307dc5821bf501a3001bd8 /configure.ac | |
| parent | 0ad0de3646b1d0db93890da2450d72970c116c97 (diff) | |
| parent | 7652767580f7b8be6761ccf5b5dc7a303d51348c (diff) | |
| download | ayatana-indicator-power-502f3f9dc58ddbe9ccae645d5e29fb0e7c09a65d.tar.gz ayatana-indicator-power-502f3f9dc58ddbe9ccae645d5e29fb0e7c09a65d.tar.bz2 ayatana-indicator-power-502f3f9dc58ddbe9ccae645d5e29fb0e7c09a65d.zip | |
Import upstream version 0.2
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 1e882e6..b8724b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([indicator-power], - [0.1], + [0.2], [http://bugs.launchpad.net/indicator-power], [indicator-power], [http://launchpad.net/indicator-power]) @@ -30,13 +30,13 @@ LT_INIT ########################### GTK_REQUIRED_VERSION=3.0 -INDICATOR_REQUIRED_VERSION=0.3.0 +INDICATOR_REQUIRED_VERSION=0.3.90 UPOWER_REQUIRED_VERSION=0.9.5 PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION]) PKG_CHECK_MODULES([INDICATOR],[ gtk+-3.0 >= $GTK_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION ]) ########################### @@ -54,30 +54,14 @@ AC_ARG_ENABLE([localinstall], # Indicator Info ########################### -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/3/" - INDICATORICONSDIR="${datadir}/indicator-applet/icons/" -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 +AS_IF([test "x$with_localinstall" = "xyes"], + [INDICATORDIR="${libdir}/indicators3/2/" + INDICATORICONSDIR="${datadir}/indicator-applet/icons/"], + [INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`]) AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - ############################## # Custom Junk ############################## |