From 9f8a9bc5939ec2720afc219eb0a3d5db8def08cd Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 10 Jul 2000 10:25:39 +0000
Subject: [PATCH] LANGUAGE should be neutralized too.

* acgeneral.m4 (_AC_INIT_PREPARE_ENVIRONMENT): Do it.
* doc/autoconf.texi (Special Shell Variables): Mention it.
---
 ChangeLog               |  7 +++++++
 acgeneral.m4            |  1 +
 doc/autoconf.texi       | 18 +++++++++---------
 lib/autoconf/general.m4 |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8969e18d..c8f7d343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+	LANGUAGE should be neutralized too.
+
+	* acgeneral.m4 (_AC_INIT_PREPARE_ENVIRONMENT): Do it.
+	* doc/autoconf.texi (Special Shell Variables): Mention it.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
 	Set autoconf's default warnings to `syntax'.
diff --git a/acgeneral.m4 b/acgeneral.m4
index d88d34f1..019d20a7 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1802,6 +1802,7 @@ fi
 AC_SHELL_UNSET([LANG],        [C])
 AC_SHELL_UNSET([LC_ALL],      [C])
 AC_SHELL_UNSET([LC_CTYPE],    [C])
+AC_SHELL_UNSET([LANGUAGE],    [C])
 AC_SHELL_UNSET([LC_MESSAGES], [C])
 
 # IFS
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index bb2afd15..5dd707fd 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -4722,24 +4722,24 @@ fall back, see @ref{Limitations of Builtins}.
 
 @item LANG
 @itemx LC_ALL
-@itemx LC_MESSAGES
 @itemx LC_CTYPE
+@itemx LANGUAGE
+@itemx LC_MESSAGES
 @evindex LANG
 @evindex LC_ALL
-@evindex LC_MESSAGES
 @evindex LC_CTYPE
+@evindex LANGUAGE
+@evindex LC_MESSAGES
 
 These must not be set unconditionally because not all systems understand
 e.g. @samp{LANG=C} (notably SCO).  Fixing @code{LC_MESSAGES} prevents
 Solaris @command{sh} from translating var values in @code{set}!  Non-C
-@code{LC_CTYPE} values break the ctype check.  Therefore, run:
+@code{LC_CTYPE} values break the ctype check.  @code{LANGUAGE} is a
+@sc{gnu} extension.
 
-@example
-test "$@{LANG+set@}" = set && LANG=C && export LANG
-test "$@{LC_ALL+set@}" = set && LC_ALL=C && export LC_ALL
-test "$@{LC_CTYPE+set@}" = set && LC_CTYPE=C && export LC_CTYPE
-test "$@{LC_MESSAGES+set@}" = set && LC_MESSAGES=C && export LC_MESSAGES
-@end example
+@emph{If} one of these variables is set, you should try to unset it,
+using @samp{C} as a fall back value. see @ref{Limitations of Builtins},
+builtin @command{unset}, for more details.
 
 @item NULLCMD
 @evindex NULLCMD
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index d88d34f1..019d20a7 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1802,6 +1802,7 @@ fi
 AC_SHELL_UNSET([LANG],        [C])
 AC_SHELL_UNSET([LC_ALL],      [C])
 AC_SHELL_UNSET([LC_CTYPE],    [C])
+AC_SHELL_UNSET([LANGUAGE],    [C])
 AC_SHELL_UNSET([LC_MESSAGES], [C])
 
 # IFS