From 20d50ffbc4fe37b6f836451656c8d907a556dfc3 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 1 Apr 2009 22:06:40 +0200
Subject: configure.ac: fail when LAME is enabled but not found

Use MPD_AUTO_RESULT(), and set enable_lame to "auto" by default.
---
 configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'configure.ac')

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)
-- 
cgit v1.2.3