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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index dba8c315eea1018b53382fac4cf28e866e4b6726..95de2b02197cd84f0bec4aefeb2526ef33903239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2008-10-21  Eric Blake  <ebb9@byu.net>
 
+       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 47881390b3aed0b9b678e3bd9e6e7d73d72181b9..14fe31550d86e5bc619cff4e96028dd3279ae899 100644 (file)
--- 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 b0032bf55efd7d266fd823c9f0c01fbdc7dceb76..b03e0459a3aba2d61b7c282d51d4ffe3ffece709 100644 (file)
--- 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 59b8dca09ef440e83f2768c156111ce6f6241e50..062063e181a9b46316f69bf8ccb9059049bf772f 100644 (file)
--- 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 0ab85a597432713473db04da346e0283cce013e9..2c89b2f4c0327af4b8c12bffec2611217ed3a9a1 100644 (file)
--- 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 57da252ad29fa6075f51e5696b3ca0232eb51ed4..06866e80817ea8f8d734b83c131768b57adcdb4d 100644 (file)
--- 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 75938139d25d80e5c6269cd6914ba53d07db56bf..c98c419eb1017683f8a04fa5f33fb3cafe78c086 100644 (file)
--- 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