From 16562b36b84eb68549da61a366d03b5dda7cb4d0 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 28 Apr 2006 04:17:51 +0000
Subject: [PATCH] * doc/autoconf.texi (Limitations of Builtins): Document
 FreeBSD /bin/sh set unsorted output. * lib/autoconf/general.m4
 (_AC_CACHE_DUMP): Adjust. * tests/local.at

---
 ChangeLog               | 7 +++++++
 doc/autoconf.texi       | 3 +++
 lib/autoconf/general.m4 | 3 ++-
 tests/local.at          | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57c5fcc3..b7f897e6 100644
--- 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 7659bd67..acfb9ec4 100644
--- 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 73174085..e29cf9bd 100644
--- 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 1f3f4e96..b4548e5d 100644
--- 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
 ]])
-- 
2.11.4.GIT