* lib/m4sugar/m4sh.m4 (_AS_UNSET_PREPARE): s/FOO/as_foo/ to avoid

user name space clashes.
Reported by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 041ec9dda26433ce5d0d447ff68fe042415c92e7..b2a8f8c37a50c562e22b518524b05dc87cdc64a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-16  Akim Demaille  <akim@epita.fr>
+
+       * lib/m4sugar/m4sh.m4 (_AS_UNSET_PREPARE): s/FOO/as_foo/ to avoid
+       user name space clashes.
+       Reported by Bruno Haible.
+
 2003-05-16  Akim Demaille  <akim@epita.fr>
 
        * bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in,

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index ee2cfa7a5c65576dc43bfa90af28e964743d2c43..8e9e85b38b8572df6891c854d0e6f8ef2de0558e 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -278,7 +278,7 @@ fi
 # AS_UNSET depends upon $as_unset: compute it.
 m4_defun([_AS_UNSET_PREPARE],
 [# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false