summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-01-26 09:58:34 +0100
committerMax Kellermann <max@musicpd.org>2017-01-26 09:58:34 +0100
commit5ad1fe77b1d40f5f8556affbfa6af06af93b44f9 (patch)
treea68fe9cfdf150c77a0612650f06ce656f2499488 /m4
parent8d4ed1e988f025e9daca33a69337aa76f4e5489b (diff)
m4/mpd_depends.m4: print warning when disabling the feature
Diffstat (limited to 'm4')
-rw-r--r--m4/mpd_auto.m42
-rw-r--r--m4/mpd_depends.m45
2 files changed, 4 insertions, 3 deletions
diff --git a/m4/mpd_auto.m4 b/m4/mpd_auto.m4
index ed64064d1..7a13b4cdc 100644
--- a/m4/mpd_auto.m4
+++ b/m4/mpd_auto.m4
@@ -181,5 +181,5 @@ dnl
dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg
AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [
MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6],
- [MPD_DEPENDS([enable_$1], [$7], [$8])])
+ [MPD_DEPENDS([enable_$1], [$7], [$4], [$8])])
])
diff --git a/m4/mpd_depends.m4 b/m4/mpd_depends.m4
index a60e11b82..8fa11a2ba 100644
--- a/m4/mpd_depends.m4
+++ b/m4/mpd_depends.m4
@@ -2,13 +2,14 @@ dnl Declare a dependency of one feature on another. If the depending
dnl feature is disabled, the former must be disabled as well. If the
dnl former was explicitly enabled, abort with an error message.
dnl
-dnl Parameters: varname1, varname2 (=dependency), errmsg
+dnl Parameters: varname1, varname2 (=dependency), description, errmsg
AC_DEFUN([MPD_DEPENDS], [
if test x$$2 = xno; then
if test x$$1 = xauto; then
+ AC_MSG_WARN([$4: disabling $3])
$1=no
elif test x$$1 = xyes; then
- AC_MSG_ERROR([$3])
+ AC_MSG_ERROR([$3: $4])
fi
fi
])