Update from gnulib.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 80d8665f4d5ef7ac5262af784338d312f710403b..66ef901362d2bc7db5bc3b245c3c874ed96872cb 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-24  Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.m4 (gl_MBSWIDTH): Renamed from jm_PREREQ_MBSWIDTH. Use
+       onceonly macros.
+
+2002-12-17  Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.m4 (jm_PREREQ_MBSWIDTH): Remove checks for limits.h,
+       stdlib.h, string.h.
+
 2003-02-17  Bruno Haible  <bruno@clisp.org>
 
        * mkdtemp.m4 (gl_PREREQ_MKDTEMP): New macro.

diff --git a/gettext-tools/m4/mbswidth.m4 b/gettext-tools/m4/mbswidth.m4
index 4059320868106b3d9c8dcf84e7fe6043424aaff6..e90209bf6d4343f74373c788a79c46cfdf964461 100644 (file)
--- a/gettext-tools/m4/mbswidth.m4
+++ b/gettext-tools/m4/mbswidth.m4
@@ -1,19 +1,13 @@
-# mbswidth.m4 serial 6 (fileutils-4.1.3)
-dnl Copyright (C) 2000-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
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+#serial 9
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
 
-AC_DEFUN([jm_PREREQ_MBSWIDTH],
+AC_DEFUN([gl_MBSWIDTH],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
-  AC_CHECK_FUNCS(isascii iswcntrl iswprint mbsinit wcwidth)
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+  AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit)
+  AC_CHECK_FUNCS(iswcntrl wcwidth)
   jm_FUNC_MBRTOWC
 
   AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,