From d095eb92d1d645ec1d68740fb7bab023431bc2ec Mon Sep 17 00:00:00 2001 From: Matija Skala Date: Thu, 28 Aug 2014 15:29:10 +0200 Subject: fix INDICATORDIR variable being set to wrong value while built for gtk3, the applet loaded gtk2 indicator --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 377cdf7..12fa5f0 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ case "$with_gtk" in esac INDICATOR_REQUIRED_VERSION=0.3.22 +INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4 PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION x11 @@ -55,11 +56,11 @@ PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -PKG_CHECK_MODULES([INDICATOR4], [indicator$INDICATOR_API_VERSION-0.4 >= $INDICATOR_REQUIRED_VERSION], +PKG_CHECK_MODULES([INDICATOR4], [$INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION], [ 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` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR_PKG` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $INDICATOR_PKG` ], [PKG_CHECK_MODULES([INDICATOR3], [indicator >= $INDICATOR_REQUIRED_VERSION], [ -- cgit v1.2.1