jm_ -> gl_

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index b4c746405324396cfa6bed2df2dd4b73102166de..364de4738e54dc42df7831146924feae0f02d269 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,24 @@
+2004-04-19  Bruno Haible  <bruno@clisp.org>
+
+       * error.m4: Change jm_ to gl_ in AC_DEFINE'd names. Update all uses.
+
+2004-04-19  Bruno Haible  <bruno@clisp.org>
+
+       * mbrtowc.m4: Change jm_ to gl_ in cache variables as well.
+
+2004-04-18  Jim Meyering  <jim@meyering.net>
+
+       * mbswidth.m4: Change jm_ to gl_ in AC_DEFINE'd names. Update all uses.
+       * mkdtemp.m4: Likewise.
+       * unlocked-io.m4: Likewise.
+       * quotearg.m4: Likewise.
+
+2004-03-18  Paul Eggert  <eggert@twinsun.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.m4 (gl_MBSWIDTH): Also test whether <wchar.h> declares
+       mbswidth.
+
 2004-03-08  Bruno Haible  <bruno@clisp.org>
 
        * csharpcomp.m4 (gt_CSHARPCOMP): Test whether csc is not the chicken

diff --git a/gettext-tools/m4/error.m4 b/gettext-tools/m4/error.m4
index eb97cfb9efffffaa5ca8e08b7e76665da3c6b857..c8039f41d1e8381b240523252290d25fa0a09e83 100644 (file)
--- a/gettext-tools/m4/error.m4
+++ b/gettext-tools/m4/error.m4
@@ -1,4 +1,4 @@
-# error.m4 serial 2 (gettext-0.12)
+# error.m4 serial 3 (gettext-0.15)
 dnl Copyright (C) 2002-2003 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
@@ -18,12 +18,12 @@ AC_DEFUN([gt_FUNC_ERROR_AT_LINE],
     AC_DEFINE(HAVE_ERROR_AT_LINE, 1,
       [Define to 1 if you have the functions error() and error_at_line().])
   else
-    jm_PREREQ_ERROR
+    gl_PREREQ_ERROR
   fi
 ])
 
 # Prerequisites of lib/error.c.
-AC_DEFUN([jm_PREREQ_ERROR],
+AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_HEADER_STDC])
   AC_REQUIRE([AC_FUNC_VPRINTF])

diff --git a/gettext-tools/m4/mbrtowc.m4 b/gettext-tools/m4/mbrtowc.m4
index 21e9daababc11943715c1ca42b0c95cc30be94f9..3d8768ecbec86f98a90e4014ab55d913808eb50f 100644 (file)
--- a/gettext-tools/m4/mbrtowc.m4
+++ b/gettext-tools/m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 5
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# mbrtowc.m4 serial 7
+dnl Copyright (C) 2001-2002, 2004 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
@@ -8,19 +8,19 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert
 
-dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with
+dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
 dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
 
-AC_DEFUN([jm_FUNC_MBRTOWC],
+AC_DEFUN([gl_FUNC_MBRTOWC],
 [
   AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
-    jm_cv_func_mbrtowc,
+    gl_cv_func_mbrtowc,
     [AC_TRY_LINK(
        [#include <wchar.h>],
        [mbstate_t state; return ! (sizeof state && mbrtowc);],
-       jm_cv_func_mbrtowc=yes,
-       jm_cv_func_mbrtowc=no)])
-  if test $jm_cv_func_mbrtowc = yes; then
+       gl_cv_func_mbrtowc=yes,
+       gl_cv_func_mbrtowc=no)])
+  if test $gl_cv_func_mbrtowc = yes; then
     AC_DEFINE(HAVE_MBRTOWC, 1,
       [Define to 1 if mbrtowc and mbstate_t are properly declared.])
   fi

diff --git a/gettext-tools/m4/mbswidth.m4 b/gettext-tools/m4/mbswidth.m4
index d7981ca39b74db3fd7b286dd2af5dd7586a20aba..f61be107a8d49fb00524c8ab4c42f2940f5a75d1 100644 (file)
--- a/gettext-tools/m4/mbswidth.m4
+++ b/gettext-tools/m4/mbswidth.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 11
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
@@ -8,7 +8,7 @@ AC_DEFUN([gl_MBSWIDTH],
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit)
   AC_CHECK_FUNCS(iswcntrl wcwidth)
-  jm_FUNC_MBRTOWC
+  gl_FUNC_MBRTOWC
 
   AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,
     [AC_TRY_COMPILE([
@@ -32,5 +32,24 @@ AC_DEFUN([gl_MBSWIDTH],
   AC_DEFINE_UNQUOTED(HAVE_DECL_WCWIDTH, $ac_val,
     [Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise.])
 
+  dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth()
+  dnl that clashes with ours.
+  AC_CACHE_CHECK([whether mbswidth is declared in <wchar.h>],
+    ac_cv_have_decl_mbswidth,
+    [AC_TRY_COMPILE([
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+], [
+  char *p = (char *) mbswidth;
+], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)])
+  if test $ac_cv_have_decl_mbswidth = yes; then
+    ac_val=1
+  else
+    ac_val=0
+  fi
+  AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val,
+    [Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0 otherwise.])
+
   AC_TYPE_MBSTATE_T
 ])

diff --git a/gettext-tools/m4/mkdtemp.m4 b/gettext-tools/m4/mkdtemp.m4
index a729b44fe9c66b8f1fc7ab3db7016e5e9bcad2c6..f64fe11f62de14aaf54f8070fe1aa3ba52c8b3be 100644 (file)
--- a/gettext-tools/m4/mkdtemp.m4
+++ b/gettext-tools/m4/mkdtemp.m4
@@ -1,4 +1,4 @@
-# mkdtemp.m4 serial 2
+# mkdtemp.m4 serial 3
 dnl Copyright (C) 2001-2003 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
@@ -20,6 +20,6 @@ AC_DEFUN([gl_PREREQ_MKDTEMP],
   AC_REQUIRE([AC_HEADER_STAT])
   AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
   AC_CHECK_HEADERS(time.h)
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_CHECK_FUNCS(gettimeofday)
 ])

diff --git a/gettext-tools/m4/quotearg.m4 b/gettext-tools/m4/quotearg.m4
index 2fba109f1c47358bef3fc2c897711a2459b36968..aa4a3d14738ce411bcd6cc01098cc6a5290def37 100644 (file)
--- a/gettext-tools/m4/quotearg.m4
+++ b/gettext-tools/m4/quotearg.m4
@@ -1,4 +1,4 @@
-# quotearg.m4 serial 1
+# quotearg.m4 serial 2
 dnl Copyright (C) 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
@@ -12,5 +12,5 @@ AC_DEFUN([gl_QUOTEARG],
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
   AC_TYPE_MBSTATE_T
-  jm_FUNC_MBRTOWC
+  gl_FUNC_MBRTOWC
 ])

diff --git a/gettext-tools/m4/unlocked-io.m4 b/gettext-tools/m4/unlocked-io.m4
index f8e98f1d12b3fa8ffbde4a1b2d29ec42097dda42..cd1c5f4ef7393da670629b9525f4eaa4d700fa8b 100644 (file)
--- a/gettext-tools/m4/unlocked-io.m4
+++ b/gettext-tools/m4/unlocked-io.m4
@@ -1,4 +1,4 @@
-#serial 8 -*- autoconf -*-
+#serial 9
 
 dnl From Jim Meyering.
 dnl
@@ -8,7 +8,7 @@ dnl (because some of them were declared in Solaris 2.5.1 but were removed
 dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run
 dnl on Solaris 2.6).
 
-AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
+AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
 [
   dnl Persuade glibc and Solaris <stdio.h> to declare
   dnl fgets_unlocked(), fputs_unlocked() etc.