From c41fa6cf5ea637a2e62b130d65853aa727c386f7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Dec 2008 17:16:24 +0100 Subject: [PATCH] configure.ac: check lame availability before shout_mp3 test If lame was not available, the shout_mp3 plugin was enabled anyway, and triggered compiler errors. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 5e21bae29..cf5f679fc 100644 --- a/configure.ac +++ b/configure.ac @@ -356,6 +356,11 @@ if test x$enable_shout_ogg = xyes; then fi fi +if test x$enable_lame = xyes; then + AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"], + [enable_lame=no; AC_MSG_WARN(You need lame -- disabling lame support)]) +fi + if test x$enable_shout_mp3 = xyes; then if test x$enable_lame = xno; then AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled]) @@ -460,11 +465,6 @@ fi AM_CONDITIONAL(HAVE_MAD, test x$enable_mp3 = xyes) -if test x$enable_lame = xyes; then - AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"], - [enable_lame=no;AC_MSG_WARN(You need lame -- disabling lame support)]) -fi - if test x$enable_mpc = xyes; then if test "x$mpcdec_libraries" != "x" ; then