From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Jun 2009 19:01:07 +0000 (+0200)
Subject: Fix bug that caused AM_GNU_GETTEXT([external], [need-formatstring-macros]) to
X-Git-Tag: v0.16.1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aafb1cfad0817773af64dcff5b78098220bebc76;p=thirdparty%2Fgettext.git

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 c5f801c9a..35a58e78b 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 b5ce322fb..91c345e99 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