diff options
| author | Max Kellermann <max@duempel.org> | 2009-03-28 21:39:26 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-03-28 21:39:26 +0100 |
| commit | 33aeac4fcbc1f7a53304d1677b5ac01bb4ce3766 (patch) | |
| tree | 023354efe03d5a4dd812453259152116f93bdc5f | |
| parent | 5164cc1ff811aee5466ef72d9ebb18e282a00bd6 (diff) | |
Makefile.am: use PULSE_CFLAGS and PULSE_LIBS
Don't add those to MPD_CFLAGS and MPD_LIBS.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index e20aeea5..34e46a87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -449,12 +449,14 @@ OUTPUT_CFLAGS = \ $(AO_CFLAGS) \ $(ALSA_CFLAGS) \ $(JACK_CFLAGS) \ + $(PULSE_CFLAGS) \ $(SHOUT_CFLAGS) OUTPUT_LIBS = \ $(AO_LIBS) \ $(ALSA_LIBS) \ $(JACK_LIBS) \ + $(PULSE_LIBS) \ $(SHOUT_LIBS) OUTPUT_API_SRC = \ diff --git a/configure.ac b/configure.ac index b1e200ff..3d6ec62a 100644 --- a/configure.ac +++ b/configure.ac @@ -660,10 +660,8 @@ AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes) if test x$enable_pulse = xyes; then PKG_CHECK_MODULES([PULSE], [libpulse-simple], - [enable_pulse=yes;AC_DEFINE([HAVE_PULSE], 1, - [Define to enable PulseAudio support])] - MPD_LIBS="$MPD_LIBS $PULSE_LIBS" - MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS", + [AC_DEFINE([HAVE_PULSE], 1, + [Define to enable PulseAudio support])], [enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])]) fi |