diff options
author | Max Kellermann <max@duempel.org> | 2009-11-11 06:45:23 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-11-11 06:45:23 +0100 |
commit | 7c0c8ca8d790eba95eba4138074897e4ceca99df (patch) | |
tree | 2f37dc823a6a154e856a846341e0edf1ec3d18bc /configure.ac | |
parent | 884be8e2b33c4ae536ee72ed1783aacdfe35bd6b (diff) | |
parent | 79035d7ed97b702cf33a91c460fc379d6133d6f6 (diff) | |
download | mpd-7c0c8ca8d790eba95eba4138074897e4ceca99df.tar.gz mpd-7c0c8ca8d790eba95eba4138074897e4ceca99df.tar.xz mpd-7c0c8ca8d790eba95eba4138074897e4ceca99df.zip |
Merge branch 'master' of git://git.musicpd.org/metyl/mpd
Diffstat (limited to '')
-rw-r--r-- | configure.ac | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1ccb3b70d..2efff82a6 100644 --- a/configure.ac +++ b/configure.ac @@ -659,6 +659,11 @@ AC_ARG_ENABLE(twolame-encoder, [enable the TwoLAME mp2 encoder]),, enable_twolame_encoder=auto) +AC_ARG_ENABLE(wave-encoder, + AS_HELP_STRING([--enable-wave-encoder], + [enable the PCM wave encoder]),, + enable_wave_encoder=yes) + dnl dnl audio output plugins @@ -1078,6 +1083,7 @@ else enable_vorbis_encoder=no enable_lame_encoder=no enable_twolame_encoder=no + enable_wave_encoder=no fi MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc], @@ -1097,7 +1103,8 @@ MPD_AUTO_PKG(twolame_encoder, TWOLAME, [twolame], if test x$enable_vorbis_encoder != xno || test x$enable_lame_encoder != xno || - test x$enable_twolame_encoder != xno; then + test x$enable_twolame_encoder != xno || + test x$enable_wave_encoder != xno; then # at least one encoder plugin is enabled enable_encoder=yes else @@ -1178,6 +1185,11 @@ if test x$enable_twolame_encoder = xyes; then [Define to enable the TwoLAME encoder plugin]) fi +AM_CONDITIONAL(ENABLE_WAVE_ENCODER, test x$enable_wave_encoder = xyes) +if test x$enable_wave_encoder = xyes; then + AC_DEFINE(ENABLE_WAVE_ENCODER, 1, + [Define to enable the PCM wave encoder plugin]) +fi dnl dnl Documentation @@ -1429,6 +1441,12 @@ if echo " TwoLAME mp3 encoder ...........disabled" fi + if test x$enable_wave_encoder = xyes; then + echo " PCM wave encoder ..............enabled" + else + echo " PCM wave encoder ..............disabled" + fi + echo "" fi |