Updating branch refs/heads/master
to 271d08165de2f39a65b633b9c58c23561b783203 (commit)
from 54cf5579b016a122c97b19672b1093d83c78f64a (commit)
commit 271d08165de2f39a65b633b9c58c23561b783203
Author: Lionel Le Folgoc <[email protected]>
Date: Tue Oct 25 11:54:02 2011 +0200
Fix location of indicator dirs
configure.in.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 107ae55..5b40e90 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -67,7 +67,7 @@ dnl ***********************************
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0], [],
[XDT_CHECK_PACKAGE([INDICATOR], [indicator-0.4], [0.3.90])])
+XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0],
[indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], [indicator-0.4],
[0.3.90], [indicator_pkgname=indicator-0.4], [])])
dnl ***********************************
dnl *** Check for debugging support ***
@@ -77,8 +77,8 @@ XDT_FEATURE_DEBUG()
dnl ***********************
dnl *** Indicator info ***
dnl ***********************
-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $indicator_pkgname`
+INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $indicator_pkgname`
AC_SUBST(INDICATORDIR)
AC_SUBST(INDICATORICONSDIR)
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
