* libltdl/config/ltmain.m4sh (NLS nuisances): Fix quoting of

localization variables for shell-active characters.
* tests/localization.at (localized compiler messages): Extend
test.
* THANKS: Update.
Report by Mike Frysinger.

diff --git a/ChangeLog b/ChangeLog
index ea3ebcca33f365108e934590a4f049b0b8080df2..3faaa03d53cac41e3c91e935578fb32cd3203967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/config/ltmain.m4sh (NLS nuisances): Fix quoting of
+       localization variables for shell-active characters.
+       * tests/localization.at (localized compiler messages): Extend
+       test.
+       * THANKS: Update.
+       Report by Mike Frysinger.
+
 2008-03-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/defs.m4sh (func_get_config): Build egrep regex to speed

diff --git a/THANKS b/THANKS
index 6ef4e31bc3a70f24c93a8a2cfc4e03fce7c2b821..9f24876ea19db777ff547de6d84b7571d35d49e9 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -108,6 +108,7 @@
   Marc Espie                   espie@nerim.net
   Marc J. Fraioli              fraioli@dg-rtp.dg.com
   Mark Kettenis                        kettenis@phys.uva.nl
+  Mike Frysinger               vapier@gentoo.org
   Olly Betts                   olly@muscat.co.uk
   Patrick Welche               prlw1@newn.cam.ac.uk
   Paul Eggert                  eggert@twinsun.com

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 9ccb0203ba3f06ac4dba239350254b09b488a351..a9df38d68ed5e2ab5084dba98609114978e2776e 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -104,7 +104,7 @@ do
           save_$lt_var=\$$lt_var
           $lt_var=C
          export $lt_var
-         lt_user_locale=\"$lt_var=\$save_$lt_var; \$lt_user_locale\"
+         lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
          lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
        fi"
 done

diff --git a/tests/localization.at b/tests/localization.at
index 195e20c28c6db43b7393a954c6e9a7bba6406aef..311aca743f09d38b89cff4548fd31923eb2f4fb4 100644 (file)
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -34,6 +34,9 @@ export LANG LANGUAGE LC_ALL
 AT_DATA([a.c],
 [[int x[-1];
 ]])
+AT_DATA([b.c],
+[[int y;
+]])
 
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr])
 mv -f stdout expected-stdout
@@ -44,4 +47,11 @@ AT_CHECK([diff expected-stderr stderr])
 LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
 AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -])
 
+# check that we get our quoting right.
+LANGUAGE='a; nosuchprogram " '\''  & $x /#+*(){}|,:`\ !%'
+export LANGUAGE
+AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c],
+        [0], [stdout], [stderr])
+AT_CHECK([grep nosuchprogram stdout stderr], [1])
+
 AT_CLEANUP