From c1057f0c347f80579461d6a06f645e2bb1c7b673 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Thu, 17 Mar 2005 00:56:31 +0000 Subject: slight tweak of avuton's idea of causing an error when no audio output's found git-svn-id: https://svn.musicpd.org/mpd/trunk@3093 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- configure.ac | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e28457aeb..3395fdb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -126,14 +126,6 @@ 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_ao = xno && - test x$enable_oss = xno && - test x$enable_shout = xno && - test x$enable_alsa = xno && - test x$enable_osx = xno; then - AC_MSG_ERROR("Cannot compile without an output target") -fi - if test x$enable_alsa = xyes; then AM_PATH_ALSA(0.9.0,[AC_DEFINE(HAVE_ALSA,1,[Define to enable ALSA support]) MPD_LIBS="$MPD_LIBS $ALSA_LIBS" MPD_CFLAGS="$MPD_CFLAGS $ALSA_CFLAGS"],enable_alsa=no) fi @@ -559,22 +551,6 @@ fi echo "" -echo "Volume Mixer Support:" - -if test x$enable_oss = xyes; then - echo "OSS mixer support .............enabled" -else - echo "OSS mixer support .............disabled" -fi - -if test x$enable_alsa = xyes; then - echo "ALSA mixer support ............enabled" -else - echo "ALSA mixer support ............disabled" -fi - -echo "" - echo "Audio Output Support:" if test x$enable_ao = xyes; then echo "Playing audio via libao .......enabled" @@ -608,6 +584,14 @@ fi echo "" +if test x$enable_ao = xno && + test x$enable_oss = xno && + test x$enable_shout = xno && + test x$enable_alsa = xno && + test x$enable_osx = xno; then + AC_MSG_ERROR("No Audio Output types configured!") +fi + echo "Audio Format Support:" if test x$enable_id3 = xyes; then -- cgit v1.2.3