From e2bbeae93fe65870b47c4349d59ab567c8f155b2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 12 Feb 2007 23:39:41 +0000 Subject: [PATCH] Fix an m4 quoting bug. --- ChangeLog | 6 ++++++ m4/locale-fr.m4 | 6 ++++-- m4/locale-zh.m4 | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e2c488db..4b3c1299a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-12 Bruno Haible + + * m4/locale-fr.m4 (gt_LOCALE_FR): Fix m4 quoting bug. + * m4/locale-zh.m4 (gt_LOCALE_ZH_CN): Likewise. + Reported by Ralf Wildenhues . + 2007-02-12 Paul Eggert * lib/string_.h (strncasecmp): Fix typo: this macro takes 3 diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 22864cebb..62521a9ef 100644 --- a/m4/locale-fr.m4 +++ b/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/m4/locale-zh.m4 b/m4/locale-zh.m4 index c7409a40f..187ad3510 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,4 +1,4 @@ -# locale-zh.m4 serial 1 +# locale-zh.m4 serial 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, @@ -13,10 +13,12 @@ AC_DEFUN([gt_LOCALE_ZH_CN], AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a transitional chinese locale], gt_cv_locale_zh_CN, [ 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 -- 2.11.0