* doc/autoconf.texi (Limitations of Builtins): Document FreeBSD

/bin/sh set unsorted output.
* lib/autoconf/general.m4 (_AC_CACHE_DUMP): Adjust.
* tests/local.at

diff --git a/ChangeLog b/ChangeLog
index 57c5fcc3ed58074c54a0aadc928829d91fb87b4b..b7f897e63b7a80bcc3c021496417b42b01d5a1c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * doc/autoconf.texi (Limitations of Builtins): Document FreeBSD
+       /bin/sh set unsorted output.
+       * lib/autoconf/general.m4 (_AC_CACHE_DUMP): Adjust.
+       * tests/local.at
+
 2006-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi (Portable C and C++, Varities of Unportability):

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7659bd674c6a8aacad8dcee920a41647fe1ed09c..acfb9ec4b19aef40fe7189ff186cc60b15280226 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -12165,6 +12165,9 @@ better to combine them:
 set -ex
 @end example
 
+The @command{set} of the Free@acronym{BSD} 6.0 shell does not sort its
+output.
+
 
 @item @command{shift}
 @c ------------------

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 73174085e13f0fb7a3e38f97aa34b36f75947455..e29cf9bdc815eb75f66b9f51a438184e6ba1a7b2 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1852,7 +1852,8 @@ m4_define([_AC_CACHE_DUMP],
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n ["/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"]
       ;;
-    esac
+    esac |
+    sort
 )dnl
 ])# _AC_CACHE_DUMP
 

diff --git a/tests/local.at b/tests/local.at
index 1f3f4e968a1c2e527d98709ceb1fe274fcc25508..b4548e5ddb4b2a150b155c22989032f2fce7e504 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -181,7 +181,7 @@ m4_define([AT_CONFIGURE_AC],
 # leaves temporary files.  AT_CONFIG_CMP uses the variable dumps to confirm that
 # tests have the same side effects regardless of caching.
 m4_defun([AC_STATE_SAVE],
-[(set) >state-env.$][1 2>&1
+[(set) 2>&1 | sort >state-env.$][1
 ls -1 | sed '/^at-/d;/^state-/d;/^config\./d' | sort >state-ls.$][1
 ])# AC_STATE_SAVE
 ]])