From 446f9973cc020490b649c3b40feae2fa9ca98c0d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 1 Sep 2011 18:37:40 +0200
Subject: configure.ac: fail if FLAC was enabled explicitly, but not found

---
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4d855a70b..508775c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,9 +171,9 @@ AC_ARG_ENABLE(fifo,
 	enable_fifo=yes)
 
 AC_ARG_ENABLE(flac,
-	AS_HELP_STRING([--disable-flac],
-		[disable flac support (default: enable)]),,
-	enable_flac=yes)
+	AS_HELP_STRING([--enable-flac],
+		[enable FLAC decoder]),,
+	enable_flac=auto)
 
 AC_ARG_ENABLE(fluidsynth,
 	AS_HELP_STRING([--enable-fluidsynth],
@@ -750,10 +750,12 @@ fi
 AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
 
 dnl ----------------------------------- FLAC ----------------------------------
+
+MPD_AUTO_PKG(flac, FLAC, [flac >= 1.1],
+	[FLAC decoder], [libFLAC not found])
+
 if test x$enable_flac = xyes; then
-	PKG_CHECK_MODULES(FLAC, [flac >= 1.1],
-		AC_DEFINE(HAVE_FLAC, 1, [Define for FLAC support]),
-		enable_flac=no)
+	AC_DEFINE(HAVE_FLAC, 1, [Define for FLAC support])
 
 	oldcflags="$CFLAGS"
 	oldlibs="$LIBS"
-- 
cgit v1.2.3