Skip to content

M
mpd
Commit 469ff630 authored by J. Alexander Treuman's avatar J. Alexander Treuman
Browse files
Options

Do PKG_PROG_PKG_CONFIG if either pulse or jack is enabled. This is because

if you don't explicitly call it, then it is implied by the first use of PKG_CHECK_MODULES (and no later ones). This results in the check only being done in the test for pulse, which is skipped when --disable-pulse is used. This will fix the bug mentioned in the previous commit. git-svn-id: https://svn.musicpd.org/mpd/trunk@5142 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 0435a8c7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
configure.ac
View file @ 469ff630
...@@ -177,6 +177,10 @@ if test x$enable_oss = xyes; then ...@@ -177,6 +177,10 @@ if test x$enable_oss = xyes; then
AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no]) AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no])
fi fi
if test x$enable_pulse = xyes || test x$enable_jack = xyes; then
PKG_PROG_PKG_CONFIG
fi
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, [Define to enable PulseAudio support])] MPD_LIBS="$MPD_LIBS $PULSE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS", [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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment