Tweak for NetBSD. These idiots have a nonfunctional gettext implementation

in libc but define _nl_msg_cat_cntr.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 38c0695f55e16a6fde57417776a7e937a5f0350a..ea6d71c211da55e360821327b2c203ac8e1d13cd 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-10  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.m4 (AM_GNU_GETTEXT): Don't prevent installation of libintl
+       on NetBSD.
+
 2002-02-06  Bruno Haible  <bruno@clisp.org>
 
        * libtool.m4: Upgrade from libtool-1.4 to libtool-1.4.2.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 30ea48957514cacf40c50a22cb088a6d74bd25af..84caa4790531c37f7e34c3322d554fdaf8149b84 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 12 (gettext-0.11)
+# gettext.m4 serial 13 (gettext-0.11.1)
 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
@@ -116,9 +116,10 @@ AC_DEFUN([AM_GNU_GETTEXT],
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
             gt_cv_func_gnugettext_libc=yes,
             gt_cv_func_gnugettext_libc=no)])