Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7682:cda6a677c88b
Fix bug that caused AM_GNU_GETTEXT([external], [need-formatstring-macros])
to not recognize glibc or external libintl.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 21 Nov 2006 12:38:14 +0000 |
| parents | a6b7b31e9ddf |
| children | 40c3e7d43e2d |
| files | ChangeLog m4/gettext.m4 |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-20 Bruno Haible <bruno@clisp.org> + + * gettext.m4 (AM_GNU_GETTEXT): Revert 2005-07-28 patch: Use + changequote instead of pairs of brackets. + Reported by Andreas Schwab <schwab@suse.de>. + 2006-11-21 Jim Meyering <jim@meyering.net> * lib/fts.c (fts_safe_changedir): Move a declaration "up", @@ -31,12 +37,6 @@ * lib/idcache.c: Adjust comments in user- and group- portions to be more accurate, and to be consistent with one another. -2006-11-20 Andreas Schwab <schwab@suse.de> (tiny change) - - Avoid syntax error in test program. - * m4/gettext.m4 (AM_GNU_GETTEXT): When inside a [...] context, - quote with "[...]", not "[[...]]". - 2006-11-20 Jim Meyering <jim@meyering.net> * lib/idcache.c: Restore most of the 2006-11-06 patch, so as to
--- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 58 (gettext-0.16) +# gettext.m4 serial 59 (gettext-0.16.1) dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -137,12 +137,14 @@ dnl to fall back to GNU NLS library. if test $gt_api_version -ge 3; then - gt_revision_test_code='[[ + gt_revision_test_code=' #ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif +changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]]' +changequote([,])dnl +' else gt_revision_test_code= fi