diff options
| author | monsta <[email protected]> | 2016-06-19 23:01:51 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-06-19 23:01:51 +0300 |
| commit | 37753676942b92a8f717fad2f8cdac629c907de0 (patch) | |
| tree | 52bc556d5a36a9b8b4522ef60886f322049212f8 | |
| parent | c59b52777a65115caaa7b419ba43d03106f4b914 (diff) | |
| download | mate-indicator-applet-37753676942b92a8f717fad2f8cdac629c907de0.tar.bz2 mate-indicator-applet-37753676942b92a8f717fad2f8cdac629c907de0.tar.xz | |
build: make check for indicator lib a separate check
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | 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 |