diff options
| -rw-r--r-- | configure.ac | 214 |
1 files changed, 111 insertions, 103 deletions
diff --git a/configure.ac b/configure.ac index d71d3eb0f..d1d887d44 100644 --- a/configure.ac +++ b/configure.ac @@ -499,7 +499,7 @@ AC_ARG_ENABLE(fifo, AC_ARG_ENABLE(pipe-output, AS_HELP_STRING([--enable-pipe-output], - [disable support for writing audio to a pipe (default: disable)]),, + [enable support for writing audio to a pipe (default: disable)]),, enable_pipe_output=no) if test x$enable_pipe_output = xyes; then @@ -1177,18 +1177,18 @@ echo "########### MPD CONFIGURATION ############" echo "" echo " Client Support:" -if test x$enable_tcp = xyes; then - echo " TCP support ...................enabled" -else - echo " TCP support ...................disabled" -fi - if test x$enable_ipv6 = xyes; then echo " IPv6 support ..................enabled" else echo " IPv6 support ..................disabled" fi +if test x$enable_tcp = xyes; then + echo " TCP support ...................enabled" +else + echo " TCP support ...................disabled" +fi + if test x$enable_un = xyes; then echo " Unix domain socket support ....enabled" else @@ -1204,46 +1204,52 @@ if fi echo " Playback Support:" -if test x$enable_ao = xyes; then - echo " libao support .................enabled" -else - echo " libao support .................disabled" -fi - -if test x$enable_oss = xyes; then - echo " OSS support ...................enabled" -else - echo " OSS support ...................disabled" -fi - if test x$enable_alsa = xyes; then echo " ALSA support ..................enabled" else echo " ALSA support ..................disabled" fi +if test x$enable_fifo = xyes; then + echo " FIFO support ..................enabled" +else + echo " FIFO support ..................disabled" +fi + if test x$enable_jack = xyes; then echo " JACK support ..................enabled" else echo " JACK support ..................disabled" fi +if test x$enable_ao = xyes; then + echo " libao support .................enabled" +else + echo " libao support .................disabled" +fi + +if test x$enable_oss = xyes; then + echo " OSS support ...................enabled" +else + echo " OSS support ...................disabled" +fi + if test x$enable_osx = xyes; then echo " OS X support ..................enabled" else echo " OS X support ..................disabled" fi -if test x$enable_pulse = xyes; then - echo " PulseAudio support ............enabled" +if test x$enable_pipe_output = xyes; then + echo " Pipeline output support .......enabled" else - echo " PulseAudio support ............disabled" + echo " Pipeline output support .......disabled" fi -if test x$enable_fifo = xyes; then - echo " FIFO support ..................enabled" +if test x$enable_pulse = xyes; then + echo " PulseAudio support ............enabled" else - echo " FIFO support ..................disabled" + echo " PulseAudio support ............disabled" fi if test x$enable_mvp = xyes; then @@ -1275,39 +1281,29 @@ if test x$enable_ao = xno && test x$enable_pulse = xno && test x$enable_jack = xno && test x$enable_fifo = xno && + test x$enable_pipe_output = xno && test x$enable_mvp = xno; then AC_MSG_ERROR([No Audio Output types configured!]) fi echo " File Format Support:" -if test x$enable_id3 = xyes; then - echo " ID3 tag support ...............enabled" -else - echo " ID3 tag support ...............disabled" -fi - -if test x$enable_mp3 = xyes; then - echo " mp3 support ...................enabled" +if test x$enable_aac = xyes; then + echo " AAC support ...................enabled" else - echo " mp3 support ...................disabled" + echo " AAC support ...................disabled" fi -if test x$enable_lame = xyes; then - echo " lame support ..................enabled" +if test x$enable_sidplay = xyes; then + echo " C64 SID support ...............enabled" else - echo " lame support ..................disabled" + echo " C64 SID support ...............disabled" fi -if test x$enable_oggvorbis = xyes; then - echo " Ogg Vorbis support ............enabled" - if test x$use_tremor = xyes; then - echo " using tremor.................yes" - else - echo " using tremor.................no" - fi +if test x$enable_ffmpeg = xyes; then + echo " FFMPEG support ................enabled" else - echo " Ogg Vorbis support ............disabled" + echo " FFMPEG support ................disabled" fi if test x$enable_flac = xyes; then @@ -1316,28 +1312,28 @@ else echo " FLAC support ..................disabled" fi -case $enable_oggflac in -yes) - echo " OggFLAC support ...............enabled" - ;; -flac) - echo " OggFLAC support ...............enabled(FLAC 1.1.3)" - ;; -*) - echo " OggFLAC support ...............disabled" - ;; -esac +if test x$enable_fluidsynth = xyes; then + echo " fluidsynth MIDI support .......enabled" +else + echo " fluidsynth MIDI support .......disabled" +fi -if test x$enable_audiofile = xyes; then - echo " Wave file support .............enabled" +if test x$enable_mod = xyes; then + echo " MOD support ...................enabled" else - echo " Wave file support .............disabled" + echo " MOD support ...................disabled" fi -if test x$enable_aac = xyes; then - echo " AAC support ...................enabled" +if test x$enable_modplug = xyes; then + echo " MODPLUG support ...............enabled" else - echo " AAC support ...................disabled" + echo " MODPLUG support ...............disabled" +fi + +if test x$enable_mp3 = xyes; then + echo " mp3 support ...................enabled" +else + echo " mp3 support ...................disabled" fi if test x$enable_mp4 = xyes; then @@ -1352,34 +1348,39 @@ else echo " Musepack (MPC) support ........disabled" fi -if test x$enable_wavpack = xyes; then - echo " WavPack support ...............enabled" -else - echo " WavPack support ...............disabled" -fi - -if test x$enable_mod = xyes; then - echo " MOD support ...................enabled" -else - echo " MOD support ...................disabled" -fi +case $enable_oggflac in +yes) + echo " OggFLAC support ...............enabled" + ;; +flac) + echo " OggFLAC support ...............enabled(FLAC 1.1.3)" + ;; +*) + echo " OggFLAC support ...............disabled" + ;; +esac -if test x$enable_modplug = xyes; then - echo " MODPLUG support ...............enabled" +if test x$enable_oggvorbis = xyes; then + echo " Ogg Vorbis support ............enabled" + if test x$use_tremor = xyes; then + echo " using tremor.................yes" + else + echo " using tremor.................no" + fi else - echo " MODPLUG support ...............disabled" + echo " Ogg Vorbis support ............disabled" fi -if test x$enable_sidplay = xyes; then - echo " C64 SID support ...............enabled" +if test x$enable_audiofile = xyes; then + echo " Wave file support .............enabled" else - echo " C64 SID support ...............disabled" + echo " Wave file support .............disabled" fi -if test x$enable_fluidsynth = xyes; then - echo " fluidsynth MIDI support .......enabled" +if test x$enable_wavpack = xyes; then + echo " WavPack support ...............enabled" else - echo " fluidsynth MIDI support .......disabled" + echo " WavPack support ...............disabled" fi if test x$enable_wildmidi = xyes; then @@ -1388,11 +1389,7 @@ else echo " wildmidi MIDI support .........disabled" fi -if test x$enable_ffmpeg = xyes; then - echo " FFMPEG support ................enabled" -else - echo " FFMPEG support ................disabled" -fi + if test x$enable_mp3 = xno && @@ -1408,6 +1405,7 @@ if test x$enable_sidplay = xno && test x$enable_fluidsynth = xno && test x$enable_wildmidi = xno && + test x$enable_mp4 = xno && test x$enable_mod = xno; then AC_MSG_ERROR([No input plugins supported!]) fi @@ -1421,39 +1419,43 @@ else echo " BZ2 archives support ..........disabled" fi -if test x$enable_zip = xyes; then - echo " ZIP archives support ..........enabled" -else - echo " ZIP archives support ..........disabled" -fi - if test x$enable_iso = xyes; then echo " ISO 9660 archives support .....enabled" else echo " ISO 9660 archives support .....disabled" fi +if test x$enable_zip = xyes; then + echo " ZIP archives support ..........enabled" +else + echo " ZIP archives support ..........disabled" +fi + echo "" echo " Other features:" -if test x$enable_lsr = xyes; then - echo " libsamplerate support .........enabled" +if test x$enable_curl != xno; then + echo " HTTP streaming (libcurl) ......enabled" else - echo " libsamplerate support .........disabled" + echo " HTTP streaming (libcurl) ......disabled" fi - -if test x$with_zeroconf != xno; then - echo " Zeroconf support ..............$with_zeroconf" +if test x$enable_id3 = xyes; then + echo " ID3 tag support ...............enabled" else - echo " Zeroconf support ..............disabled" + echo " ID3 tag support ...............disabled" fi +if test x$enable_lame = xyes; then + echo " lame support ..................enabled" +else + echo " lame support ..................disabled" +fi -if test x$enable_curl != xno; then - echo " HTTP streaming (libcurl) ......enabled" +if test x$enable_lsr = xyes; then + echo " libsamplerate support .........enabled" else - echo " HTTP streaming (libcurl) ......disabled" + echo " libsamplerate support .........disabled" fi if test x$enable_mms != xno; then @@ -1462,6 +1464,12 @@ else echo " MMS streaming (libmms) ........disabled" fi +if test x$with_zeroconf != xno; then + echo " Zeroconf support ..............$with_zeroconf" +else + echo " Zeroconf support ..............disabled" +fi + echo "" echo "##########################################" echo "" |