From 37753676942b92a8f717fad2f8cdac629c907de0 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Sun, 19 Jun 2016 23:01:51 +0300
Subject: build: make check for indicator lib a separate check

---
 configure.ac    |  6 +++++-
 src/Makefile.am | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 467b84e..f6e139e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,11 +51,15 @@ 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(INDICATOR, $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
+
+AC_SUBST(INDICATOR_CFLAGS)
+AC_SUBST(INDICATOR_LIBS)
+
 ###########################
 # Check to see if we're local
 ###########################
diff --git a/src/Makefile.am b/src/Makefile.am
index 1799f54..63458e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ mate_indicator_applet_CFLAGS = \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET \
 	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
+	$(APPLET_CFLAGS) \
+	$(INDICATOR_CFLAGS)
 
 mate_indicator_applet_SOURCES = \
 	applet-main.c \
@@ -22,6 +23,7 @@ mate_indicator_applet_SOURCES = \
 
 mate_indicator_applet_LDADD = \
 	$(APPLET_LIBS) \
+	$(INDICATOR_LIBS) \
 	-lX11
 
 mate_indicator_applet_appmenu_CFLAGS = \
@@ -31,7 +33,8 @@ mate_indicator_applet_appmenu_CFLAGS = \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET_APPMENU \
 	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
+	$(APPLET_CFLAGS) \
+	$(INDICATOR_CFLAGS)
 
 mate_indicator_applet_appmenu_SOURCES = \
 	applet-main.c \
@@ -42,6 +45,7 @@ mate_indicator_applet_appmenu_SOURCES = \
 
 mate_indicator_applet_appmenu_LDADD = \
 	$(APPLET_LIBS) \
+	$(INDICATOR_LIBS) \
 	-lX11
 
 mate_indicator_applet_complete_CFLAGS = \
@@ -51,7 +55,8 @@ mate_indicator_applet_complete_CFLAGS = \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET_COMPLETE \
 	-I$(srcdir)/.. \
-	$(APPLET_CFLAGS)
+	$(APPLET_CFLAGS) \
+	$(INDICATOR_CFLAGS)
 
 mate_indicator_applet_complete_SOURCES =	\
 	applet-main.c \
@@ -62,4 +67,5 @@ mate_indicator_applet_complete_SOURCES =	\
 
 mate_indicator_applet_complete_LDADD = \
 	$(APPLET_LIBS) \
+	$(INDICATOR_LIBS) \
 	-lX11
-- 
cgit v1.2.1