gnulib module 'wcwidth'.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index b0c025bb29ef3c03e1d15e8fa4c11a68bfc55ae5..f26735bd4607f85172a2dd5b61ea94ac103d090d 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-22  Bruno Haible  <bruno@clisp.org>
 
+       * wcwidth.m4: New file, from gnulib.
+       * Makefile.am (EXTRA_DIST): Add it.
+
        * fnmatch.m4: Update from gnulib.
 
        * error.m4: Update from gnulib.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index f5895358164ae8774a35cbdb0f2622cea2d1c0a7..2127047f50845ad4a181593c5a392a60e950c10f 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -101,4 +101,5 @@ tmpdir.m4 \
 unionwait.m4 \
 unistd_h.m4 \
 unlocked-io.m4 \
+wcwidth.m4 \
 xreadlink.m4

diff --git a/gettext-tools/m4/wcwidth.m4 b/gettext-tools/m4/wcwidth.m4
new file mode 100644 (file)
index 0000000..09cf55a
--- /dev/null
+++ b/gettext-tools/m4/wcwidth.m4
@@ -0,0 +1,26 @@
+# wcwidth.m4 serial 3
+dnl Copyright (C) 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,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCWIDTH],
+[
+  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  AC_REQUIRE([AC_GNU_SOURCE])
+
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+
+  AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
+  AC_CHECK_FUNCS_ONCE([iswprint wcwidth])
+
+  AC_CHECK_DECLS([wcwidth], [], [], [
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+])])