diff options
| author | Max Kellermann <max@duempel.org> | 2009-04-01 22:06:40 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-04-01 22:06:40 +0200 |
| commit | 20d50ffbc4fe37b6f836451656c8d907a556dfc3 (patch) | |
| tree | 723dd70a047624fac2477da3697ee61be0c6375e /configure.ac | |
| parent | b9a5e787807e85898e9b9d13d41e0a1f0230c359 (diff) | |
| download | mpd-20d50ffbc4fe37b6f836451656c8d907a556dfc3.tar.gz mpd-20d50ffbc4fe37b6f836451656c8d907a556dfc3.tar.xz mpd-20d50ffbc4fe37b6f836451656c8d907a556dfc3.zip | |
configure.ac: fail when LAME is enabled but not found
Use MPD_AUTO_RESULT(), and set enable_lame to "auto" by default.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index b6a687664..fc6fe4fc0 100644 --- a/configure.ac +++ b/configure.ac @@ -521,9 +521,9 @@ AC_ARG_ENABLE(oggvorbis-encoder, [enable_oggvorbis_encoder=auto]) AC_ARG_ENABLE(lame, - AS_HELP_STRING([--disable-lame], - [disable support for mp3 streaming (default: enable)]),, - enable_lame=yes) + AS_HELP_STRING([--enable-lame], + [disable support for mp3 streaming]),, + enable_lame=auto) dnl @@ -956,10 +956,10 @@ fi MPD_AUTO_PKG(oggvorbis_encoder, VORBISENC, [vorbisenc], [Ogg Vorbis encoder], [libvorbisenc not found]) -if test x$enable_lame = xyes; then - AM_PATH_LAME(, - [enable_lame=no; - AC_MSG_WARN(You need lame -- disabling lame support)]) +if test x$enable_lame != xno; then + AM_PATH_LAME([found_lame=yes], [found_lame=no]) + MPD_AUTO_RESULT(lame, [LAME encoder plugin], + [LAME not found]) fi AC_SUBST(LAME_CFLAGS) |