From 469ff630932ce2ca0fa4874c5a8bff7fa2ead025 Mon Sep 17 00:00:00 2001 From: "J. Alexander Treuman" Date: Sun, 17 Dec 2006 23:42:36 +0000 Subject: 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 --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 76b05baa4..f8aee7a4c 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) 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 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", -- cgit v1.2.3