From 30dd29e251f6a9d247b2203a1e3030c4d52b106c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 24 Oct 2014 23:43:21 +0200
Subject: configure.ac: improve database dependency checks

Abort if --enable-libmpdclient or --enable-upnp are used with
--disable-database, instead of ignoring the mismatch silently.
---
 configure.ac      | 8 ++++++--
 m4/mpd_depends.m4 | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 m4/mpd_depends.m4

diff --git a/configure.ac b/configure.ac
index 9b6e67854..d7f8a3238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,9 @@ fi
 AC_ARG_ENABLE(libmpdclient,
 	AS_HELP_STRING([--enable-libmpdclient],
 		[enable support for the MPD client]),,
-	enable_libmpdclient=$database_auto)
+	enable_libmpdclient=auto)
+MPD_DEPENDS([enable_libmpdclient], [enable_database],
+	[Cannot use --enable-libmpdclient with --disable-database])
 
 AC_ARG_ENABLE(expat,
 	AS_HELP_STRING([--enable-expat],
@@ -303,7 +305,9 @@ AC_ARG_ENABLE(expat,
 AC_ARG_ENABLE(upnp,
 	AS_HELP_STRING([--enable-upnp],
 		[enable UPnP client support (default: auto)]),,
-	enable_upnp=$database_auto)
+	enable_upnp=auto)
+MPD_DEPENDS([enable_upnp], [enable_database],
+	[Cannot use --enable-upnp with --disable-database])
 
 AC_ARG_ENABLE(adplug,
 	AS_HELP_STRING([--enable-adplug],
diff --git a/m4/mpd_depends.m4 b/m4/mpd_depends.m4
new file mode 100644
index 000000000..4898f9084
--- /dev/null
+++ b/m4/mpd_depends.m4
@@ -0,0 +1,9 @@
+AC_DEFUN([MPD_DEPENDS], [
+	if test x$$2 = xno; then
+		if test x$$1 = xauto; then
+			$1=no
+		elif test x$$1 = xyes; then
+			AC_MSG_ERROR([$3])
+		fi
+	fi
+])
-- 
cgit v1.2.3