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

m4/mpd_auto.m4: fix displayed default value

Browse Source 
Was hard-coded to "auto", and the macro parameter was ignored (in the
help text).
This commit is contained in:
Max Kellermann
2014-12-08 18:38:52 +01:00
parent 36f0bd432c
commit 16f729eb22
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
m4/mpd_auto.m4
View File

@@ -77,13 +77,18 @@ AC_DEFUN([MPD_AUTO_LIB], [
[$5])]) [$5])])
]) ])
AC_DEFUN([MPD_FORMAT_DEFAULT],
[ifelse([$1], [], [auto],
index([$1], [$]), [-1], [$1],
[auto])])
dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG dnl Wrapper for AC_ARG_ENABLE and MPD_AUTO_PKG
dnl dnl
dnl Parameters: varname1, varname2, pkg, description, errmsg, default, pre dnl Parameters: varname1, varname2, pkg, description, errmsg, default, pre
AC_DEFUN([MPD_ENABLE_AUTO_PKG], [ AC_DEFUN([MPD_ENABLE_AUTO_PKG], [
AC_ARG_ENABLE(translit([$1], [_], [-]), AC_ARG_ENABLE(translit([$1], [_], [-]),
AS_HELP_STRING([--enable-]translit([$1], [_], [-]), AS_HELP_STRING([--enable-]translit([$1], [_], [-]),
[enable $4 (default: auto)]),, [enable $4 (default: ]MPD_FORMAT_DEFAULT([$6])[)]),,
[enable_$1=]ifelse([$6], [], [auto], [$6])) [enable_$1=]ifelse([$6], [], [auto], [$6]))
$7 $7
@@ -102,7 +107,7 @@ dnl Parameters: varname1, varname2, pkg, libname, symname, libs, cflags, descrip
AC_DEFUN([MPD_ENABLE_AUTO_PKG_LIB], [ AC_DEFUN([MPD_ENABLE_AUTO_PKG_LIB], [
AC_ARG_ENABLE(translit([$1], [_], [-]), AC_ARG_ENABLE(translit([$1], [_], [-]),
AS_HELP_STRING([--enable-]translit([$1], [_], [-]), AS_HELP_STRING([--enable-]translit([$1], [_], [-]),
[enable $4 (default: auto)]),, [enable $4 (default: ]MPD_FORMAT_DEFAULT([$10])[)]),,
[enable_$1=]ifelse([$10], [], [auto], [$10])) [enable_$1=]ifelse([$10], [], [auto], [$10]))
$11 $11