aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-02-27 20:02:29 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-02-27 20:02:29 +0000
commit45f00b71613977b536d86f035e73f0af22d2acfb (patch)
tree5c5753cf3cdf0fe53363c59af2a736322a2bd8cc
parent7ca84d3166d7edca23e119f5b127396c5c966c59 (diff)
downloadmpd-45f00b71613977b536d86f035e73f0af22d2acfb.tar.gz
mpd-45f00b71613977b536d86f035e73f0af22d2acfb.tar.xz
mpd-45f00b71613977b536d86f035e73f0af22d2acfb.zip
LSR and Zeroconf support both use PKG_CHECK_MODULES, and thus require
PKG_PROG_PKG_CONFIG to be done first. But this is only done if PulseAudio and JACK aren't explitily disabled. Therefore, using ./configure --disable-pulse --disable-jack will make it so that neither LSR nor Zeroconf can be found. This is the second time this bug has come up (first being when JACK was added), so can people please start adding to the test around PKG_PROG_PKG_CONFIG when they add new features that need PKG_CHECK_MODULES? git-svn-id: https://svn.musicpd.org/mpd/trunk@5453 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 95386d296..3ceb8907b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,8 @@ 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])
fi
-if test x$enable_pulse = xyes || test x$enable_jack = xyes; then
+if test x$enable_pulse = xyes || test x$enable_jack = xyes
+ test x$enable_lsr = xyes || test x$with_zeroconf != xno; then
PKG_PROG_PKG_CONFIG
fi