Allow AS_VAR_SET_IF in shell lists.

* lib/m4sugar/m4sh.m4 (AS_VAR_SET_IF): Allow continuation of
line.
* lib/autoconf/general.m4 (AC_CACHE_VAL): Supply newline no longer
provided by AS_VAR_SET_IF.
* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Adjust
clients.
* lib/autoconf/libs.m4 (AC_SEARCH_LIBS): 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 95de2b02197cd84f0bec4aefeb2526ef33903239..cb4d54a878df361db90884afc0ad30871117995d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-10-21  Eric Blake  <ebb9@byu.net>
 
+       Allow AS_VAR_SET_IF in shell lists.
+       * lib/m4sugar/m4sh.m4 (AS_VAR_SET_IF): Allow continuation of
+       line.
+       * lib/autoconf/general.m4 (AC_CACHE_VAL): Supply newline no longer
+       provided by AS_VAR_SET_IF.
+       * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Adjust
+       clients.
+       * lib/autoconf/libs.m4 (AC_SEARCH_LIBS): Likewise.
+       * tests/m4sh.at (AS@&t@_VAR basics): Enhance test.
+
        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.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b03e0459a3aba2d61b7c282d51d4ffe3ffece709..95734ec736620926031f143eb0cdaf3a433b42e2 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2002,7 +2002,8 @@ m4_if(m4_index([$2], [AC_SUBST]), [-1], [],
 [where no actions should be taken])])dnl
 AS_VAR_SET_IF([$1],
              [_AS_ECHO_N([(cached) ])],
-             [$2])])
+             [$2])
+])
 
 
 # AC_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS)

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index cb9f65315e10bceeb4acf40f5634da488eb791c2..40121077e08cc7065b24ddc4ea91b211ead30fbe 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -141,9 +141,9 @@ case $ac_header_compiler:$ac_header_preproc:$ac_[]_AC_LANG_ABBREV[]_preproc_warn
     ;;
 esac
 AC_CACHE_CHECK([for $1], [ac_Header],
-              [AS_VAR_SET([ac_Header], [$ac_header_preproc])])
-])dnl ! set ac_HEADER
-AS_VAR_IF([ac_Header], [yes], [$2], [$3])[]dnl
+              [AS_VAR_SET([ac_Header], [$ac_header_preproc])])[]dnl
+])
+AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])dnl
 ])# _AC_CHECK_HEADER_MONGREL
 
@@ -160,7 +160,7 @@ AC_CACHE_CHECK([for $1], [ac_Header],
 @%:@include <$1>])],
                                  [AS_VAR_SET([ac_Header], [yes])],
                                  [AS_VAR_SET([ac_Header], [no])])])
-AS_VAR_IF([ac_Header], [yes], [$2], [$3])[]dnl
+AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])dnl
 ])# _AC_CHECK_HEADER_NEW
 
@@ -175,7 +175,7 @@ AC_CACHE_CHECK([for $1], [ac_Header],
               [AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <$1>])],
                                         [AS_VAR_SET([ac_Header], [yes])],
                                         [AS_VAR_SET([ac_Header], [no])])])
-AS_VAR_IF([ac_Header], [yes], [$2], [$3])[]dnl
+AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])dnl
 ])# _AC_CHECK_HEADER_OLD
 
@@ -403,7 +403,7 @@ AC_CACHE_CHECK([for $1 that defines DIR], [ac_Header],
 return 0;])],
                   [AS_VAR_SET([ac_Header], [yes])],
                   [AS_VAR_SET([ac_Header], [no])])])
-AS_VAR_IF([ac_Header], [yes], [$2], [$3])[]dnl
+AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])dnl
 ])# _AC_CHECK_HEADER_DIRENT
 

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 062063e181a9b46316f69bf8ccb9059049bf772f..cbc42186792643743304a26efa4a85ff4f97c3ed 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -79,9 +79,9 @@ for ac_lib in '' $2; do
     LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
   fi
   AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])])
-  AS_VAR_SET_IF([ac_Search], [break])dnl
+  AS_VAR_SET_IF([ac_Search], [break])
 done
-AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl
+AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS])
 AS_VAR_COPY([ac_res], [ac_Search])

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 06866e80817ea8f8d734b83c131768b57adcdb4d..c2c4afd8df42b9826a81d72e52dbf40d5a7a4222 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1778,9 +1778,7 @@ m4_define([AS_VAR_SET],
 # Implement a shell `if-then-else' depending whether VARIABLE is set
 # or not.  Polymorphic.
 m4_define([AS_VAR_SET_IF],
-[AS_IF([AS_VAR_TEST_SET([$1])], [$2], [$3])
-dnl fixme: remove the newline?
-])
+[AS_IF([AS_VAR_TEST_SET([$1])], [$2], [$3])])
 
 
 # AS_VAR_TEST_SET(VARIABLE)

diff --git a/tests/m4sh.at b/tests/m4sh.at
index c98c419eb1017683f8a04fa5f33fb3cafe78c086..49c2b7e9a52f2432777e8dc3d8813c8899c80398 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -949,7 +949,7 @@ AT_DATA_M4SH([script.as], [[dnl
 AS_INIT
 # Literals.
 dnl AS_VAR_SET_IF also covers AS_VAR_TEST_SET
-AS_VAR_SET_IF([foo], [echo oops], [echo ok])
+AS_VAR_SET_IF([foo], [echo oops]) && echo ok
 AS_VAR_SET([foo], ['\a  "weird" `value` with; $fun '\''characters
 ']) # 'font-lock
 AS_VAR_COPY([bar], [foo])
@@ -966,7 +966,7 @@ m4_ifdef([tmp], [echo oops])
 # Indirects via shell vars.
 echo '===='
 num=1
-AS_VAR_SET_IF([foo$num], [echo oops], [echo ok])
+AS_VAR_SET_IF([foo$num], [echo oops]) && echo ok
 AS_VAR_SET([foo$num], ['\a  "weird" `value` with; $fun '\''characters
 ']) # 'font-lock
 AS_VAR_COPY([bar], [foo$num])
@@ -984,7 +984,7 @@ m4_ifdef([tmp], [echo oops])
 
 # Indirects via command substitution.
 echo '===='
-AS_VAR_SET_IF([`echo foo3`], [echo oops], [echo ok])
+AS_VAR_SET_IF([`echo foo3`], [echo oops]) && echo ok
 AS_VAR_SET([`echo foo3`], ['\a  "weird" `value` with; $fun '\''characters
 ']) # 'font-lock
 AS_VAR_COPY([bar], [`echo foo3`])