From 4e34b2ac00be848775b435ad679d9bf7a74e3a29 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 21 Nov 2006 12:35:46 +0000 Subject: Fix bug that caused AM_GNU_GETTEXT([external], [need-formatstring-macros]) to not recognize glibc nor external libintl. --- gettext-runtime/m4/ChangeLog | 6 ++++++ gettext-runtime/m4/gettext.m4 | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'gettext-runtime') diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index c5f801c..35a58e7 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-11-20 Bruno Haible + + * gettext.m4 (AM_GNU_GETTEXT): Revert 2005-07-28 patch: Use + changequote instead of pairs of brackets. + Reported by Andreas Schwab . + 2006-10-26 Bruno Haible * gettext-0.16 released. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index b5ce322..91c345e 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/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 @@ AC_DEFUN([AM_GNU_GETTEXT], 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 -- cgit v1.1