summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2011-12-28 15:43:29 +0100
committerStefano Karapetsas <[email protected]>2011-12-28 15:43:29 +0100
commit8f97f68c8dd6af221e31b4a14d38be6d4a1cc18c (patch)
tree5bc1abf4417de462c058994431db92f9175b18b2
parent18e3f4648a7ae10486c6d65af5aa44bb9aa312a6 (diff)
downloadmate-indicator-applet-8f97f68c8dd6af221e31b4a14d38be6d4a1cc18c.tar.bz2
mate-indicator-applet-8f97f68c8dd6af221e31b4a14d38be6d4a1cc18c.tar.xz
fix INDICATORDIR bug with indicator-0.4mate-indicator-applet-1.1.0
-rw-r--r--configure.ac16
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 0598ac7..eebf6bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,17 @@ AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
PKG_CHECK_MODULES([INDICATOR4], [indicator-0.4 >= $INDICATOR_REQUIRED_VERSION],
- [AC_DEFINE([HAVE_INDICATOR4], [1], [Use Indicator 0.4])],
+ [
+ AC_DEFINE([HAVE_INDICATOR4], [1], [Use Indicator 0.4])
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
+ ],
[PKG_CHECK_MODULES([INDICATOR3], [indicator >= $INDICATOR_REQUIRED_VERSION],
- [AC_DEFINE([HAVE_INDICATOR3], [1], [Use Indicator 0.3])
- ])
+ [
+ AC_DEFINE([HAVE_INDICATOR3], [1], [Use Indicator 0.3])
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+ ])
])
AC_SUBST(INDICATOR4_CFLAGS)
@@ -61,9 +68,6 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all
if test "x$with_localinstall" = "xyes"; then
INDICATORDIR="${libdir}/indicators/2/"
INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
-else
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
fi
AC_SUBST(INDICATORDIR)