* acgeneral.m4 (AC_SHELL_UNSET): Don't rely on variable

assignments changing $?.

diff --git a/ChangeLog b/ChangeLog
index 801a459026733aacb6cc9c6112fce744d5fae594..71384d27bc5185aa51fd7a22ca814a18233ef8a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-28  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (AC_SHELL_UNSET): Don't rely on variable
+       assignments changing $?.
+
 2000-09-28  Pavel Roskin  <proski@gnu.org>
 
        * acgeneral.m4 (_AC_OUTPUT_FILES): Fixed exit status.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 59c937ab27f35acb6ffb86e7d1c172f052e6c5a3..14dc82e1fec049e6c76646de5031ea68e3a62f8c 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -804,7 +804,7 @@ $debug ||
 # Try to unset the env VAR, otherwise set it to
 # VALUE-IF-UNSET-NOT-SUPPORTED.  `ac_unset' must have been computed.
 define([AC_SHELL_UNSET],
-[$ac_unset $1 || test "${$1+set}" != set || $1=$2 && export $1])
+[$ac_unset $1 || test "${$1+set}" != set || { $1=$2; export $1; }])
 
 
 # AC_SHELL_MKDIR_P(PATH)

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 59c937ab27f35acb6ffb86e7d1c172f052e6c5a3..14dc82e1fec049e6c76646de5031ea68e3a62f8c 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -804,7 +804,7 @@ $debug ||
 # Try to unset the env VAR, otherwise set it to
 # VALUE-IF-UNSET-NOT-SUPPORTED.  `ac_unset' must have been computed.
 define([AC_SHELL_UNSET],
-[$ac_unset $1 || test "${$1+set}" != set || $1=$2 && export $1])
+[$ac_unset $1 || test "${$1+set}" != set || { $1=$2; export $1; }])
 
 
 # AC_SHELL_MKDIR_P(PATH)