Fix m4 quoting bug.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index eb53dccc7f4889e39cdbf330ef1057966f73a783..655859cc899f6cc3b2fa53aa27f6a84619c92b2c 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-12  Bruno Haible  <bruno@clisp.org>
+
+       * locale-fr.m4 (gt_LOCALE_FR): Fix m4 quoting bug.
+       * locale-ja.m4 (gt_LOCALE_JA): Likewise.
+       Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
 2006-12-10  Bruno Haible  <bruno@clisp.org>
 
        * locale-ja.m4: New file.

diff --git a/gettext-tools/m4/locale-fr.m4 b/gettext-tools/m4/locale-fr.m4
index 22864cebb6caedd959b3990889e6b1e40cf7f252..62521a9efb991ace26fce245d8e5e9cf28b69bd4 100644 (file)
--- a/gettext-tools/m4/locale-fr.m4
+++ b/gettext-tools/m4/locale-fr.m4
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+# locale-fr.m4 serial 4 (gettext-0.16.2)
+dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,10 +13,12 @@ AC_DEFUN([gt_LOCALE_FR],
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CACHE_CHECK([for a traditional french locale], gt_cv_locale_fr, [
     macosx=
+changequote(,)dnl
     case "$host_os" in
       darwin[56]*) ;;
       darwin*) macosx=yes;;
     esac
+changequote([,])dnl
     if test -n "$macosx"; then
       # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
       # encodings, but the kernel does not support them. The documentation

diff --git a/gettext-tools/m4/locale-ja.m4 b/gettext-tools/m4/locale-ja.m4
index cf065dd79d54a3941ece3acb47a26c8a7a4a6a47..4c8108265ae22be8098f5186d81a11c54fb60122 100644 (file)
--- a/gettext-tools/m4/locale-ja.m4
+++ b/gettext-tools/m4/locale-ja.m4
@@ -1,5 +1,5 @@
-# locale-ja.m4 serial 1 (gettext-0.16.2)
-dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+# locale-ja.m4 serial 2 (gettext-0.16.2)
+dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,10 +13,12 @@ AC_DEFUN([gt_LOCALE_JA],
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CACHE_CHECK([for a traditional japanese locale], gt_cv_locale_ja, [
     macosx=
+changequote(,)dnl
     case "$host_os" in
       darwin[56]*) ;;
       darwin*) macosx=yes;;
     esac
+changequote([,])dnl
     if test -n "$macosx"; then
       # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
       # encodings, but the kernel does not support them. The documentation