aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-01 10:09:46 +0200
committerMax Kellermann <max@duempel.org>2011-09-01 10:09:46 +0200
commit53ac72a8783c54467f7462cf536d637e058da0fd (patch)
treedee08b25406dadee5ceffa5f636cf9da95476f8e
parent2be6184c8d274a5b99cc2c8c86a7aebe46187320 (diff)
downloadmpd-53ac72a8783c54467f7462cf536d637e058da0fd.tar.gz
mpd-53ac72a8783c54467f7462cf536d637e058da0fd.tar.xz
mpd-53ac72a8783c54467f7462cf536d637e058da0fd.zip
Makefile.am: use AVAHI_CFLAGS, AVAHI_LIBS
Don't add those to MPD_CFLAGS / MPD_LIBS.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 88eebe60f..b3620bdeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ noinst_LIBRARIES =
src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)
src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
+ $(AVAHI_CFLAGS) \
$(LIBWRAP_CFLAGS) \
$(SQLITE_CFLAGS) \
$(ARCHIVE_CFLAGS) \
@@ -21,6 +22,7 @@ src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
$(FILTER_CFLAGS) \
$(OUTPUT_CFLAGS)
src_mpd_LDADD = $(MPD_LIBS) \
+ $(AVAHI_LIBS) \
$(LIBWRAP_LDFLAGS) \
$(SQLITE_LIBS) \
$(ARCHIVE_LIBS) \
diff --git a/configure.ac b/configure.ac
index b362592cf..cf992eb9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,8 +542,7 @@ enable_bounjour=no
if test x$with_zeroconf != xno; then
if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then
PKG_CHECK_MODULES([AVAHI], [avahi-client avahi-glib],
- [enable_avahi=yes;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])]
- MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS")
+ [enable_avahi=yes;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])])
fi
if test x$enable_avahi = xyes; then