From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Apr 2002 13:10:10 +0000 (+0000)
Subject: Don't ignore preinstalled libintl of versions >= 0.10.36.
X-Git-Tag: 0.11.2-branchpoint~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8fb61afa7e1a1564ccfa1e1844638463ef9049f;p=thirdparty%2Fgettext.git

Don't ignore preinstalled libintl of versions >= 0.10.36.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 61ac893ac..eafc0638e 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,9 @@
 2002-04-08  Bruno Haible  <bruno@clisp.org>
 
+	* gettext.m4 (AM_GNU_GETTEXT): Don't use _nl_domain_bindings; its
+	linkage name has changed between gettext 0.10.35 and 0.10.36.
+	Reported by Albert Chin-A-Young <china@thewrittenword.com>.
+
 	* lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Handle -R options that appear
 	in $dependency_libs, for example on HP-UX 10.20 and OSF/1.
 	Reported by Albert Chin-A-Young <china@thewrittenword.com>
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 520f973d8..94bc26c8d 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 13 (gettext-0.11.1)
+# gettext.m4 serial 14 (gettext-0.11.2)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -142,14 +142,13 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
@@ -157,14 +156,13 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes