Fix bug that caused AM_GNU_GETTEXT([external], [need-formatstring-macros]) to

not recognize glibc nor external libintl.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index c5f801c9a4a4830b4f2d2f400f11791497271fad..35a58e78b79d1ae27f622f36be98ecf76351d017 100644 (file)
--- 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 b5ce322fb1b4ab9a06e7458938903cea25d0891d..91c345e992f2a9d54535ac94f5597014f5547c97 100644 (file)
--- 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