summaryrefslogtreecommitdiffstats
path: root/gettext-runtime
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-11-21 12:35:46 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:14:23 +0200
commit4e34b2ac00be848775b435ad679d9bf7a74e3a29 (patch)
tree9e83b61120abd9fb0e7d4aace1c22e62ba2547d6 /gettext-runtime
parent12c2cbaf0efad6fa5c213cb92ae35e6926f4d81a (diff)
downloadexternal_gettext-4e34b2ac00be848775b435ad679d9bf7a74e3a29.zip
external_gettext-4e34b2ac00be848775b435ad679d9bf7a74e3a29.tar.gz
external_gettext-4e34b2ac00be848775b435ad679d9bf7a74e3a29.tar.bz2
Fix bug that caused AM_GNU_GETTEXT([external], [need-formatstring-macros]) to
not recognize glibc nor external libintl.
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/m4/ChangeLog6
-rw-r--r--gettext-runtime/m4/gettext.m48
2 files changed, 11 insertions, 3 deletions
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 <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-10-26 Bruno Haible <bruno@clisp.org>
* 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