diff options
| author | Matija Skala <[email protected]> | 2014-08-28 15:29:10 +0200 |
|---|---|---|
| committer | Matija Skala <[email protected]> | 2014-08-28 15:29:10 +0200 |
| commit | d095eb92d1d645ec1d68740fb7bab023431bc2ec (patch) | |
| tree | 817e9553b5e7886e5ccdb6a80176860f27f4c5a4 | |
| parent | 4c51215f6e2ba302f4d9f1a78650d9209eca7f35 (diff) | |
| download | mate-indicator-applet-d095eb92d1d645ec1d68740fb7bab023431bc2ec.tar.bz2 mate-indicator-applet-d095eb92d1d645ec1d68740fb7bab023431bc2ec.tar.xz | |
fix INDICATORDIR variable being set to wrong value
while built for gtk3, the applet loaded gtk2 indicator
| -rw-r--r-- | configure.ac | 7 |
1 files 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], [ |