Makefile.am: use PULSE_CFLAGS and PULSE_LIBS
Don't add those to MPD_CFLAGS and MPD_LIBS.
This commit is contained in:
parent
5164cc1ff8
commit
33aeac4fcb
@ -449,12 +449,14 @@ OUTPUT_CFLAGS = \
|
|||||||
$(AO_CFLAGS) \
|
$(AO_CFLAGS) \
|
||||||
$(ALSA_CFLAGS) \
|
$(ALSA_CFLAGS) \
|
||||||
$(JACK_CFLAGS) \
|
$(JACK_CFLAGS) \
|
||||||
|
$(PULSE_CFLAGS) \
|
||||||
$(SHOUT_CFLAGS)
|
$(SHOUT_CFLAGS)
|
||||||
|
|
||||||
OUTPUT_LIBS = \
|
OUTPUT_LIBS = \
|
||||||
$(AO_LIBS) \
|
$(AO_LIBS) \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
$(JACK_LIBS) \
|
$(JACK_LIBS) \
|
||||||
|
$(PULSE_LIBS) \
|
||||||
$(SHOUT_LIBS)
|
$(SHOUT_LIBS)
|
||||||
|
|
||||||
OUTPUT_API_SRC = \
|
OUTPUT_API_SRC = \
|
||||||
|
@ -660,10 +660,8 @@ AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes)
|
|||||||
|
|
||||||
if test x$enable_pulse = xyes; then
|
if test x$enable_pulse = xyes; then
|
||||||
PKG_CHECK_MODULES([PULSE], [libpulse-simple],
|
PKG_CHECK_MODULES([PULSE], [libpulse-simple],
|
||||||
[enable_pulse=yes;AC_DEFINE([HAVE_PULSE], 1,
|
[AC_DEFINE([HAVE_PULSE], 1,
|
||||||
[Define to enable PulseAudio support])]
|
[Define to enable PulseAudio support])],
|
||||||
MPD_LIBS="$MPD_LIBS $PULSE_LIBS"
|
|
||||||
MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS",
|
|
||||||
[enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])])
|
[enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user