From 615ccd1070def08b2e1245cc3487d0e1bb73696b Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 17 Apr 2010 15:52:28 -0700 Subject: configure.ac: Add optional third variable to results. Add optional third value to results() to allow for non "yes" answers which are considered positive. --- configure.ac | 2 +- m4/pretty_print.m4 | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 3e5561d4..b8c15115 100644 --- a/configure.ac +++ b/configure.ac @@ -1478,7 +1478,7 @@ results(mad, [MAD]) results(mpg123, [MPG123]) results(mp4, [MP4]) results(mpc, [Musepack]) -results(oggflac, [OggFLAC]) +results(oggflac, [OggFLAC], flac) echo -ne '\n\t' results(with_tremor, [OggTremor]) results(vorbis, [OggVorbis]) diff --git a/m4/pretty_print.m4 b/m4/pretty_print.m4 index 37efe5de..a22357a8 100644 --- a/m4/pretty_print.m4 +++ b/m4/pretty_print.m4 @@ -1,17 +1,19 @@ AC_DEFUN([results], [ dnl This is a hack to allow "with" names, otherwise "enable". - num=`expr match $1 "with"` + num=`expr match $1 'with'` if test "$num" != "0"; then var="`echo '$'$1`" else var="`echo '$'enable_$1`" fi - echo -n "(" + echo -n '(' if eval "test x$var = xyes"; then - echo -n "+" + echo -n '+' + elif test -n "$3" && eval "test x$var = x$3"; then + echo -n '+' else - echo -n "-" + echo -n '-' fi echo -n "$2) " ]) -- cgit v1.2.3