(AS_SHELL_SANITIZE): Use AS_UNSET instead

of rolling our own unset.
(_AS_PREPARE): $as_unset CDPATH instead of AS_UNSETting it, since
in practice we needn't worry about CDPATH if unset doesn't work.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 4487490d56652026316ad0e9bdb46071097a98c9..13d75a4f87b1025d4958376b9d37eb4038fd82ba 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -159,8 +159,7 @@ m4_foreach([_AS_var],
   [LANG, LC_ALL, LC_TIME, LC_CTYPE, LANGUAGE,
    LC_COLLATE, LC_NUMERIC, LC_MESSAGES],
   [(set +x; test -n "`(_AS_var=C; export _AS_var) 2>&1`") &&
-    { $as_unset _AS_var || test "${_AS_var+set}" != set; } ||
-      { _AS_var=C; export _AS_var; }
+    { AS_UNSET(_AS_var, C); }
 ])
 
 # Required to use basename.
@@ -206,7 +205,7 @@ as_nl='
 IFS="  $as_nl"
 
 # CDPATH.
-AS_UNSET([CDPATH], [$PATH_SEPARATOR])
+$as_unset CDPATH
 ])