summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac25
-rw-r--r--src/Makefile.am12
2 files changed, 8 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 70e3fc6..f75a328 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,35 +46,17 @@ case "$with_gtk" in
;;
esac
-INDICATOR_REQUIRED_VERSION=0.3.22
+INDICATOR_REQUIRED_VERSION=0.3.90
INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
+ $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
)
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
-PKG_CHECK_MODULES([INDICATOR4], [$INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION],
- [
- AC_DEFINE([HAVE_INDICATOR4], [1], [Use 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],
- [
- 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)
-AC_SUBST(INDICATOR4_LIBS)
-AC_SUBST(INDICATOR3_CFLAGS)
-AC_SUBST(INDICATOR3_LIBS)
-
###########################
# Check to see if we're local
###########################
@@ -89,6 +71,9 @@ 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_PKG`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $INDICATOR_PKG`
fi
AC_SUBST(INDICATORDIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b66f5e..1799f54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,8 +11,7 @@ mate_indicator_applet_CFLAGS = \
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS) \
- $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
+ $(APPLET_CFLAGS)
mate_indicator_applet_SOURCES = \
applet-main.c \
@@ -23,7 +22,6 @@ mate_indicator_applet_SOURCES = \
mate_indicator_applet_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-lX11
mate_indicator_applet_appmenu_CFLAGS = \
@@ -33,8 +31,7 @@ mate_indicator_applet_appmenu_CFLAGS = \
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_APPMENU \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS) \
- $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
+ $(APPLET_CFLAGS)
mate_indicator_applet_appmenu_SOURCES = \
applet-main.c \
@@ -45,7 +42,6 @@ mate_indicator_applet_appmenu_SOURCES = \
mate_indicator_applet_appmenu_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-lX11
mate_indicator_applet_complete_CFLAGS = \
@@ -55,8 +51,7 @@ mate_indicator_applet_complete_CFLAGS = \
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_COMPLETE \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS) \
- $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
+ $(APPLET_CFLAGS)
mate_indicator_applet_complete_SOURCES = \
applet-main.c \
@@ -67,5 +62,4 @@ mate_indicator_applet_complete_SOURCES = \
mate_indicator_applet_complete_LDADD = \
$(APPLET_LIBS) \
- $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-lX11