Skip to content

M
mpd
Commit 2a69aba7 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Merge branch 'master' of git://git.musicpd.org/avuton/mpd

parents 362cc225 88793c71
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 103 deletions
configure.ac
View file @ 2a69aba7
...@@ -499,7 +499,7 @@ AC_ARG_ENABLE(fifo, ...@@ -499,7 +499,7 @@ AC_ARG_ENABLE(fifo,
AC_ARG_ENABLE(pipe-output, AC_ARG_ENABLE(pipe-output,
AS_HELP_STRING([--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) enable_pipe_output=no)
if test x$enable_pipe_output = xyes; then if test x$enable_pipe_output = xyes; then
...@@ -1177,18 +1177,18 @@ echo "########### MPD CONFIGURATION ############" ...@@ -1177,18 +1177,18 @@ echo "########### MPD CONFIGURATION ############"
echo "" echo ""
echo " Client Support:" 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 if test x$enable_ipv6 = xyes; then
echo " IPv6 support ..................enabled" echo " IPv6 support ..................enabled"
else else
echo " IPv6 support ..................disabled" echo " IPv6 support ..................disabled"
fi 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 if test x$enable_un = xyes; then
echo " Unix domain socket support ....enabled" echo " Unix domain socket support ....enabled"
else else
...@@ -1204,46 +1204,52 @@ if ...@@ -1204,46 +1204,52 @@ if
fi fi
echo " Playback Support:" 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 if test x$enable_alsa = xyes; then
echo " ALSA support ..................enabled" echo " ALSA support ..................enabled"
else else
echo " ALSA support ..................disabled" echo " ALSA support ..................disabled"
fi 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 if test x$enable_jack = xyes; then
echo " JACK support ..................enabled" echo " JACK support ..................enabled"
else else
echo " JACK support ..................disabled" echo " JACK support ..................disabled"
fi 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 if test x$enable_osx = xyes; then
echo " OS X support ..................enabled" echo " OS X support ..................enabled"
else else
echo " OS X support ..................disabled" echo " OS X support ..................disabled"
fi fi
if test x$enable_pulse = xyes; then if test x$enable_pipe_output = xyes; then
echo " PulseAudio support ............enabled" echo " Pipeline output support .......enabled"
else else
echo " PulseAudio support ............disabled" echo " Pipeline output support .......disabled"
fi fi
if test x$enable_fifo = xyes; then if test x$enable_pulse = xyes; then
echo " FIFO support ..................enabled" echo " PulseAudio support ............enabled"
else else
echo " FIFO support ..................disabled" echo " PulseAudio support ............disabled"
fi fi
if test x$enable_mvp = xyes; then if test x$enable_mvp = xyes; then
...@@ -1275,39 +1281,29 @@ if test x$enable_ao = xno && ...@@ -1275,39 +1281,29 @@ if test x$enable_ao = xno &&
test x$enable_pulse = xno && test x$enable_pulse = xno &&
test x$enable_jack = xno && test x$enable_jack = xno &&
test x$enable_fifo = xno && test x$enable_fifo = xno &&
test x$enable_pipe_output = xno &&
test x$enable_mvp = xno; then test x$enable_mvp = xno; then
AC_MSG_ERROR([No Audio Output types configured!]) AC_MSG_ERROR([No Audio Output types configured!])
fi fi
echo " File Format Support:" echo " File Format Support:"
if test x$enable_id3 = xyes; then if test x$enable_aac = xyes; then
echo " ID3 tag support ...............enabled" echo " AAC support ...................enabled"
else
echo " ID3 tag support ...............disabled"
fi
if test x$enable_mp3 = xyes; then
echo " mp3 support ...................enabled"
else else
echo " mp3 support ...................disabled" echo " AAC support ...................disabled"
fi fi
if test x$enable_lame = xyes; then if test x$enable_sidplay = xyes; then
echo " lame support ..................enabled" echo " C64 SID support ...............enabled"
else else
echo " lame support ..................disabled" echo " C64 SID support ...............disabled"
fi fi
if test x$enable_oggvorbis = xyes; then if test x$enable_ffmpeg = xyes; then
echo " Ogg Vorbis support ............enabled" echo " FFMPEG support ................enabled"
if test x$use_tremor = xyes; then
echo " using tremor.................yes"
else
echo " using tremor.................no"
fi
else else
echo " Ogg Vorbis support ............disabled" echo " FFMPEG support ................disabled"
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
...@@ -1316,28 +1312,28 @@ else ...@@ -1316,28 +1312,28 @@ else
echo " FLAC support ..................disabled" echo " FLAC support ..................disabled"
fi fi
case $enable_oggflac in if test x$enable_fluidsynth = xyes; then
yes) echo " fluidsynth MIDI support .......enabled"
echo " OggFLAC support ...............enabled" else
;; echo " fluidsynth MIDI support .......disabled"
flac) fi
echo " OggFLAC support ...............enabled(FLAC 1.1.3)"
;;
*)
echo " OggFLAC support ...............disabled"
;;
esac
if test x$enable_audiofile = xyes; then if test x$enable_mod = xyes; then
echo " Wave file support .............enabled" echo " MOD support ...................enabled"
else else
echo " Wave file support .............disabled" echo " MOD support ...................disabled"
fi fi
if test x$enable_aac = xyes; then if test x$enable_modplug = xyes; then
echo " AAC support ...................enabled" echo " MODPLUG support ...............enabled"
else 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 fi
if test x$enable_mp4 = xyes; then if test x$enable_mp4 = xyes; then
...@@ -1352,34 +1348,39 @@ else ...@@ -1352,34 +1348,39 @@ else
echo " Musepack (MPC) support ........disabled" echo " Musepack (MPC) support ........disabled"
fi fi
if test x$enable_wavpack = xyes; then case $enable_oggflac in
echo " WavPack support ...............enabled" yes)
else echo " OggFLAC support ...............enabled"
echo " WavPack support ...............disabled" ;;
fi flac)
echo " OggFLAC support ...............enabled(FLAC 1.1.3)"
if test x$enable_mod = xyes; then ;;
echo " MOD support ...................enabled" *)
else echo " OggFLAC support ...............disabled"
echo " MOD support ...................disabled" ;;
fi esac
if test x$enable_modplug = xyes; then if test x$enable_oggvorbis = xyes; then
echo " MODPLUG support ...............enabled" echo " Ogg Vorbis support ............enabled"
if test x$use_tremor = xyes; then
echo " using tremor.................yes"
else
echo " using tremor.................no"
fi
else else
echo " MODPLUG support ...............disabled" echo " Ogg Vorbis support ............disabled"
fi fi
if test x$enable_sidplay = xyes; then if test x$enable_audiofile = xyes; then
echo " C64 SID support ...............enabled" echo " Wave file support .............enabled"
else else
echo " C64 SID support ...............disabled" echo " Wave file support .............disabled"
fi fi
if test x$enable_fluidsynth = xyes; then if test x$enable_wavpack = xyes; then
echo " fluidsynth MIDI support .......enabled" echo " WavPack support ...............enabled"
else else
echo " fluidsynth MIDI support .......disabled" echo " WavPack support ...............disabled"
fi fi
if test x$enable_wildmidi = xyes; then if test x$enable_wildmidi = xyes; then
...@@ -1388,11 +1389,7 @@ else ...@@ -1388,11 +1389,7 @@ else
echo " wildmidi MIDI support .........disabled" echo " wildmidi MIDI support .........disabled"
fi fi
if test x$enable_ffmpeg = xyes; then
echo " FFMPEG support ................enabled"
else
echo " FFMPEG support ................disabled"
fi
if if
test x$enable_mp3 = xno && test x$enable_mp3 = xno &&
...@@ -1408,6 +1405,7 @@ if ...@@ -1408,6 +1405,7 @@ if
test x$enable_sidplay = xno && test x$enable_sidplay = xno &&
test x$enable_fluidsynth = xno && test x$enable_fluidsynth = xno &&
test x$enable_wildmidi = xno && test x$enable_wildmidi = xno &&
test x$enable_mp4 = xno &&
test x$enable_mod = xno; then test x$enable_mod = xno; then
AC_MSG_ERROR([No input plugins supported!]) AC_MSG_ERROR([No input plugins supported!])
fi fi
...@@ -1421,39 +1419,43 @@ else ...@@ -1421,39 +1419,43 @@ else
echo " BZ2 archives support ..........disabled" echo " BZ2 archives support ..........disabled"
fi 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 if test x$enable_iso = xyes; then
echo " ISO 9660 archives support .....enabled" echo " ISO 9660 archives support .....enabled"
else else
echo " ISO 9660 archives support .....disabled" echo " ISO 9660 archives support .....disabled"
fi fi
if test x$enable_zip = xyes; then
echo " ZIP archives support ..........enabled"
else
echo " ZIP archives support ..........disabled"
fi
echo "" echo ""
echo " Other features:" echo " Other features:"
if test x$enable_lsr = xyes; then if test x$enable_curl != xno; then
echo " libsamplerate support .........enabled" echo " HTTP streaming (libcurl) ......enabled"
else else
echo " libsamplerate support .........disabled" echo " HTTP streaming (libcurl) ......disabled"
fi fi
if test x$with_zeroconf != xno; then if test x$enable_id3 = xyes; then
echo " Zeroconf support ..............$with_zeroconf" echo " ID3 tag support ...............enabled"
else else
echo " Zeroconf support ..............disabled" echo " ID3 tag support ...............disabled"
fi 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 if test x$enable_lsr = xyes; then
echo " HTTP streaming (libcurl) ......enabled" echo " libsamplerate support .........enabled"
else else
echo " HTTP streaming (libcurl) ......disabled" echo " libsamplerate support .........disabled"
fi fi
if test x$enable_mms != xno; then if test x$enable_mms != xno; then
...@@ -1462,6 +1464,12 @@ else ...@@ -1462,6 +1464,12 @@ else
echo " MMS streaming (libmms) ........disabled" echo " MMS streaming (libmms) ........disabled"
fi fi
if test x$with_zeroconf != xno; then
echo " Zeroconf support ..............$with_zeroconf"
else
echo " Zeroconf support ..............disabled"
fi
echo "" echo ""
echo "##########################################" echo "##########################################"
echo "" echo ""
......
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