From: Eric Blake Date: Mon, 20 Oct 2008 22:56:12 +0000 (-0600) Subject: Allow AS_VAR_IF in shell lists. X-Git-Tag: v2.63b~219 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0467924f2464ae13f05644fc524a36848584444f;p=thirdparty%2Fautoconf.git Allow AS_VAR_IF in shell lists. * lib/m4sugar/m4sh.m4 (AS_VAR_IF): Allow continuation of line. * lib/autoconf/functions.m4 (AC_CHECK_FUNC): Adjust clients. * lib/autoconf/general.m4 (AC_CHECK_FILE, AC_CHECK_DECL): Likewise. * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL) (_AC_CHECK_HEADER_NEW, _AC_CHECK_HEADER_OLD) (_AC_CHECK_HEADER_DIRENT): Likewise. * lib/autoconf/libs.m4 (AC_CHECK_LIB): Likewise. * lib/autoconf/types.m4 (_AC_CHECK_TYPE_NEW, AC_CHECK_MEMBER): Likewise. * tests/m4sh.at (AS@&t@_VAR basics): Enhance test. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index dba8c315..95de2b02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2008-10-21 Eric Blake + Allow AS_VAR_IF in shell lists. + * lib/m4sugar/m4sh.m4 (AS_VAR_IF): Allow continuation of line. + * lib/autoconf/functions.m4 (AC_CHECK_FUNC): Adjust clients. + * lib/autoconf/general.m4 (AC_CHECK_FILE, AC_CHECK_DECL): + Likewise. + * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL) + (_AC_CHECK_HEADER_NEW, _AC_CHECK_HEADER_OLD) + (_AC_CHECK_HEADER_DIRENT): Likewise. + * lib/autoconf/libs.m4 (AC_CHECK_LIB): Likewise. + * lib/autoconf/types.m4 (_AC_CHECK_TYPE_NEW, AC_CHECK_MEMBER): + Likewise. + * tests/m4sh.at (AS@&t@_VAR basics): Enhance test. + Allow AS_CASE in shell lists. * lib/m4sugar/m4sh.m4 (AS_CASE): Always execute test, in case of side effects. Allow continuation of script on same line as esac. diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 index 47881390..14fe3155 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -70,7 +70,7 @@ AC_CACHE_CHECK([for $1], [ac_var], [AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], [AS_VAR_SET([ac_var], [yes])], [AS_VAR_SET([ac_var], [no])])]) -AS_VAR_IF([ac_var], [yes], [$2], [$3])dnl +AS_VAR_IF([ac_var], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_var])dnl ])# AC_CHECK_FUNC diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index b0032bf5..b03e0459 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2660,7 +2660,7 @@ if test -r "$1"; then else AS_VAR_SET([ac_File], [no]) fi]) -AS_VAR_IF([ac_File], [yes], [$2], [$3])[]dnl +AS_VAR_IF([ac_File], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_File])dnl ])# AC_CHECK_FILE @@ -2697,7 +2697,7 @@ AC_CACHE_CHECK([whether $1 is declared], [ac_Symbol], ])], [AS_VAR_SET([ac_Symbol], [yes])], [AS_VAR_SET([ac_Symbol], [no])])]) -AS_VAR_IF([ac_Symbol], [yes], [$2], [$3])[]dnl +AS_VAR_IF([ac_Symbol], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_Symbol])dnl ])# AC_CHECK_DECL diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4 index 59b8dca0..062063e1 100644 --- a/lib/autoconf/libs.m4 +++ b/lib/autoconf/libs.m4 @@ -134,7 +134,7 @@ AS_VAR_IF([ac_Lib], [yes], [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1)) LIBS="-l$1 $LIBS" ])], - [$4])dnl + [$4]) AS_VAR_POPDEF([ac_Lib])dnl ])# AC_CHECK_LIB diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 index 0ab85a59..2c89b2f4 100644 --- a/lib/autoconf/types.m4 +++ b/lib/autoconf/types.m4 @@ -160,7 +160,7 @@ AC_COMPILE_IFELSE( return 0;])], [], [AS_VAR_SET([ac_Type], [yes])])])]) -AS_VAR_IF([ac_Type], [yes], [$2], [$3])[]dnl +AS_VAR_IF([ac_Type], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_Type])dnl ])# _AC_CHECK_TYPE_NEW @@ -834,7 +834,7 @@ if (sizeof ac_aggr.m4_bpatsubst([$1], [^[^.]*\.])) return 0;])], [AS_VAR_SET([ac_Member], [yes])], [AS_VAR_SET([ac_Member], [no])])])]) -AS_VAR_IF([ac_Member], [yes], [$2], [$3])dnl +AS_VAR_IF([ac_Member], [yes], [$2], [$3]) AS_VAR_POPDEF([ac_Member])dnl ])# AC_CHECK_MEMBER diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index 57da252a..06866e80 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -1708,9 +1708,7 @@ m4_define([AS_VAR_IF], [AS_LITERAL_IF([$1], [AS_IF([test "x$$1" = x""$2], [$3], [$4])], [AS_VAR_COPY([as_val], [$1]) - AS_IF([test "x$as_val" = x""$2], [$3], [$4])]) -dnl fixme: remove the newline? -]) + AS_IF([test "x$as_val" = x""$2], [$3], [$4])])]) # AS_VAR_PUSHDEF and AS_VAR_POPDEF diff --git a/tests/m4sh.at b/tests/m4sh.at index 75938139..c98c419e 100644 --- a/tests/m4sh.at +++ b/tests/m4sh.at @@ -956,7 +956,7 @@ AS_VAR_COPY([bar], [foo]) AS_ECHO(["$bar-"]) AS_ECHO(["AS_VAR_GET([foo])-"]) AS_VAR_SET_IF([foo], [echo ok], [echo oops]) -AS_VAR_IF([foo], [string], [echo oops], [echo ok]) +AS_VAR_IF([foo], [string], [echo oops]) && echo ok AS_VAR_PUSHDEF([tmp], [foo]) AS_VAR_IF([tmp], ['\a "weird" `value` with; $fun '\''characters '], [echo ok], [echo oops]) # 'font-lock @@ -975,7 +975,7 @@ AS_VAR_COPY([foo$num], [bar]) AS_ECHO(["$foo2-"]) AS_ECHO(["AS_VAR_GET([foo$num])-"]) AS_VAR_SET_IF([foo$num], [echo ok], [echo oops]) -AS_VAR_IF([foo$num], [string], [echo oops], [echo ok]) +AS_VAR_IF([foo$num], [string], [echo oops]) && echo ok AS_VAR_PUSHDEF([tmp], [foo$num]) AS_VAR_IF([tmp], ['\a "weird" `value` with; $fun '\''characters '], [echo ok], [echo oops]) # 'font-lock @@ -993,7 +993,7 @@ AS_VAR_COPY([`echo foo4`], [bar]) AS_ECHO(["$foo4-"]) AS_ECHO(["AS_VAR_GET([`echo foo4`])-"]) AS_VAR_SET_IF([`echo foo4`], [echo ok], [echo oops]) -AS_VAR_IF([`echo foo4`], [string], [echo oops], [echo ok]) +AS_VAR_IF([`echo foo4`], [string], [echo oops]) && echo ok AS_VAR_PUSHDEF([tmp], [`echo foo4`]) AS_VAR_IF([tmp], ['\a "weird" `value` with; $fun '\''characters '], [echo ok], [echo oops]) # 'font-lock