From 9d6ee461f95e059a42aea9392c37f5a752e9be3d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 18 Jan 2018 04:06:28 +0100 Subject: Support building against Ayatana Indicators and Ubuntu Indicators alike. (#24) * If only Ayatana Indicators are present in the build env, build against them. * If only Ubuntu Indicators are present in the build env, build against them. * If both Indicator implementations are present in the build env, then we build against Ayatana Indicators. A build against this or that implementation can be enforced by configure options (--with-ayatana-indicators=yes or --with-ubuntu-indicators=yes). * If either implementation is present, but the other -with-*-indicator configure option is given, an error is thrown at configure time. * No Indicator implementation present in the build env, of course, also throws an error at configure time. --- src/Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 63458e0..e60f286 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,16 @@ +if WITH_AYATANA_INDICATOR +INDICATOR_CFLAGS = $(AYATANA_INDICATOR_CFLAGS) \ + $(AYATANA_INDICATOR_NG_CFLAGS) +INDICATOR_LIBS = $(AYATANA_INDICATOR_LIBS) \ + $(AYATANA_INDICATOR_NG_LIBS) +endif + +if WITH_UBUNTU_INDICATOR +INDICATOR_CFLAGS = $(UBUNTU_INDICATOR_CFLAGS) \ + $(UBUNTU_INDICATOR_NG_CFLAGS) +INDICATOR_LIBS = $(UBUNTU_INDICATOR_LIBS) \ + $(UBUNTU_INDICATOR_NG_LIBS) +endif libexec_PROGRAMS = \ mate-indicator-applet \ -- cgit v1.2.1