From 0c1c753e23c06c0fb8cf7287138fc2776cfe538f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 14 Jul 2009 14:23:49 +0200
Subject: configure.ac: fail when ffmpeg is enabled, but not found

---
 configure.ac | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index ebf08cb8f..aca0743c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,9 +397,9 @@ AC_ARG_ENABLE(audiofile,
 	enable_audiofile=yes)
 
 AC_ARG_ENABLE(ffmpeg,
-	AS_HELP_STRING([--disable-ffmpeg],
-		[disable FFMPEG support (default: enable)]),,
-	enable_ffmpeg=yes)
+	AS_HELP_STRING([--enable-ffmpeg],
+		[enable FFMPEG support]),,
+	enable_ffmpeg=auto)
 
 AC_ARG_ENABLE(flac,
 	AS_HELP_STRING([--disable-flac],
@@ -914,10 +914,8 @@ fi
 
 AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
 
-if test x$enable_ffmpeg = xyes; then
-	PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
-		enable_ffmpeg=no)
-fi
+MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil],
+	[ffmpeg decoder library], [libavformat+libavcodec+libavutil not found])
 
 if test x$enable_ffmpeg = xyes; then
 	old_LIBS=$LIBS
-- 
cgit v1.2.3