From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 24 Feb 2006 19:45:48 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (startup): save all locale specific
X-Git-Tag: release-2-1b~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af7ada4155074a1d4550a9b6b993a905b35984db;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (startup): save all locale specific
environment, variables:, LANG, LANGUAGE, LC_ADDRESS, LC_ALL
LC_COLLATE, LC_CTYPE, LC_IDENTIFICATION, LC_MEASUREMENT,
LC_MESSAGES LC_MONETARY, LC_NAME, LC_NUMERIC, LC_PAPER,
LC_TELEPHONE, LC_TIME.
(func_mode_execute): Restore them.
---

diff --git a/ChangeLog b/ChangeLog
index 8045abfd3..3ffc6fafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/config/ltmain.m4sh (startup): save all locale specific
+	environment, variables:, LANG, LANGUAGE, LC_ADDRESS, LC_ALL
+	LC_COLLATE, LC_CTYPE, LC_IDENTIFICATION, LC_MEASUREMENT,
+	LC_MESSAGES LC_MONETARY, LC_NAME, LC_NUMERIC, LC_PAPER,
+	LC_TELEPHONE, LC_TIME.
+	(func_mode_execute): Restore them.
+
 2006-02-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* doc/libtool.texi (Tags): Mention `FC'.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index b47f82807..b6b5c3e08 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -77,6 +77,16 @@ VERSION=@VERSION@
 TIMESTAMP="@TIMESTAMP@"
 package_revision=@package_revision@
 
+# NLS nuisances: We save the old values to restore during execute mode.
+# AS_SHELL_SANITIZE will take care of unsetting.
+for lt_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  eval "test \"\${$lt_var+set}\" = set && save_$lt_var=\$$lt_var"
+done
+
 AS_SHELL_SANITIZE
 $as_unset CDPATH
 
@@ -1628,12 +1638,17 @@ func_mode_execute ()
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in \
+	LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+	LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+	LC_TELEPHONE LC_TIME
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$as_unset $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"