oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

m4/mpd_depends.m4: print warning when disabling the feature

Browse Source
This commit is contained in:
Max Kellermann 2017-01-26 09:58:34 +01:00
parent 8d4ed1e988
commit 5ad1fe77b1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -552,7 +552,7 @@ dnl -------------------------------- libmpdclient ------------------------------
MPD_ENABLE_AUTO_PKG_DEPENDS(libmpdclient, LIBMPDCLIENT, MPD_ENABLE_AUTO_PKG_DEPENDS(libmpdclient, LIBMPDCLIENT,
[libmpdclient >= 2.2], [libmpdclient >= 2.2],
[MPD client library], [libmpdclient not found], [], [MPD client library], [libmpdclient not found], [],
[enable_database], [Cannot use --enable-libmpdclient with --disable-database]) [enable_database], [Database support is disabled])
dnl -------------------------------- expat -------------------------------- dnl -------------------------------- expat --------------------------------
MPD_ENABLE_AUTO_PKG(expat, EXPAT, [expat], MPD_ENABLE_AUTO_PKG(expat, EXPAT, [expat],
@ -807,7 +807,7 @@ fi
MPD_ENABLE_AUTO_PKG_DEPENDS(upnp, UPNP, [libupnp], MPD_ENABLE_AUTO_PKG_DEPENDS(upnp, UPNP, [libupnp],
[UPnP client support], [libupnp not found], [], [UPnP client support], [libupnp not found], [],
[enable_database], [Cannot use --enable-upnp with --disable-database]) [enable_database], [Database support is disabled])
dnl --------------------------------- libzzip --------------------------------- dnl --------------------------------- libzzip ---------------------------------
MPD_ENABLE_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13], MPD_ENABLE_AUTO_PKG(zzip, ZZIP, [zziplib >= 0.13],

2
m4/mpd_auto.m4
View File

@ -181,5 +181,5 @@ dnl
dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg dnl Parameters: varname1, varname2, pkg, description, errmsg, default, dep_variable, dep_errmsg
AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [ AC_DEFUN([MPD_ENABLE_AUTO_PKG_DEPENDS], [
MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6], MPD_ENABLE_AUTO_PKG([$1], [$2], [$3], [$4], [$5], [$6],
[MPD_DEPENDS([enable_$1], [$7], [$8])]) [MPD_DEPENDS([enable_$1], [$7], [$4], [$8])])
]) ])

5
m4/mpd_depends.m4
View File

@ -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 feature is disabled, the former must be disabled as well. If the
dnl former was explicitly enabled, abort with an error message. dnl former was explicitly enabled, abort with an error message.
dnl dnl
dnl Parameters: varname1, varname2 (=dependency), errmsg dnl Parameters: varname1, varname2 (=dependency), description, errmsg
AC_DEFUN([MPD_DEPENDS], [ AC_DEFUN([MPD_DEPENDS], [
if test x$$2 = xno; then if test x$$2 = xno; then
if test x$$1 = xauto; then if test x$$1 = xauto; then
AC_MSG_WARN([$4: disabling $3])
$1=no $1=no
elif test x$$1 = xyes; then elif test x$$1 = xyes; then
AC_MSG_ERROR([$3]) AC_MSG_ERROR([$3: $4])
fi fi
fi fi
]) ])