Move the IFS setup and CDPATH sanitizing to AS_SHELL_SANITIZE.

diff --git a/ChangeLog b/ChangeLog
index 67ca441270d1944392ca5032297b8391fbebf875..49988b2a150ab83985442702118f144bf284ba93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/m4sugar/m4sh.m4 (_AS_PREPARE): Move the IFS setup and CDPATH
+         sanitizing...
+       (AS_SHELL_SANITIZE): ...here; mention _AS_PATH_WALK needs IFS set.
+       * lib/autoconf/general.m4 (_AC_CANONICAL_SPLIT): Add an explanation
+         why IFS is restored so late; thank you, Ralf, for reminding us.
+       
 2006-03-15  Stepan Kasal  <kasal@ucw.cz>
 
        * doc/autoconf.texi (Pretty Help Strings): No need to use cached

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 537b32cc0fca623635e9c87e13ca1d4705425be2..9ae4af8f2291fd5c4db1d65112a1909d812ccae2 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1664,6 +1664,7 @@ shift
 AC_SUBST([$1_cpu], [$[1]])dnl
 AC_SUBST([$1_vendor], [$[2]])dnl
 shift; shift
+[# Remember, the first character of IFS is used to create $]*:
 AC_SUBST([$1_os], [$[*]])dnl
 IFS=$ac_save_IFS
 ])# _AC_CANONICAL_SPLIT

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index dcff7d5ab818fb6fb028a1805844e28a23b240ca..3b96b6d3a8c89d3d6cc39284a9558d69a8d44bc7 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -326,6 +326,14 @@ _AS_CR_PREPARE
 _AS_PATH_SEPARATOR_PREPARE
 _AS_UNSET_PREPARE
 
+# IFS
+# We need space, tab and new line, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS="  $as_nl"
+
 # Find who we are.  Look in the path if we contain no path at all
 # relative or not.
 case $[0] in
@@ -371,6 +379,8 @@ _AS_BASENAME_PREPARE
 # Name of the executable.
 as_me=`AS_BASENAME("$[0]")`
 
+# CDPATH.
+$as_unset CDPATH
 ])
 
 
@@ -396,15 +406,6 @@ _AS_MKDIR_P_PREPARE
 _AS_TEST_PREPARE
 _AS_TR_CPP_PREPARE
 _AS_TR_SH_PREPARE
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS="  $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
 ])