Makefile.am: use AVAHI_CFLAGS, AVAHI_LIBS
Don't add those to MPD_CFLAGS / MPD_LIBS.
This commit is contained in:
parent
2be6184c8d
commit
53ac72a878
@ -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) \
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user