gl_FUNC_MBRTOWC has the same semantics as AC_FUNC_MBRTOWC. So it should be
named the same. I'm applying this rename:
2008-12-17 Bruno Haible <br...@clisp.org>
* m4/mbrtowc.m4 (AC_FUNC_MBRTOWC): Renamed from gl_FUNC_MBRTOWC.
* m4/mbfile.m4 (gl_MBFILE): Use AC_FUNC_MBRTOWC instead of
gl_FUNC_MBRTOWC.
* m4/mbiter.m4 (gl_MBITER): LIkewise.
* m4/mbscasecmp.m4 (gl_PREREQ_MBSCASECMP): Likewise.
* m4/mbscasestr.m4 (gl_PREREQ_MBSCASESTR): Likewise.
* m4/mbschr.m4 (gl_PREREQ_MBSCHR): Likewise.
* m4/mbscspn.m4 (gl_PREREQ_MBSCSPN): Likewise.
* m4/mbslen.m4 (gl_PREREQ_MBSLEN): Likewise.
* m4/mbsncasecmp.m4 (gl_PREREQ_MBSNCASECMP): Likewise.
* m4/mbsnlen.m4 (gl_PREREQ_MBSNLEN): Likewise.
* m4/mbspbrk.m4 (gl_PREREQ_MBSPBRK): Likewise.
* m4/mbspcasecmp.m4 (gl_PREREQ_MBSPCASECMP): Likewise.
* m4/mbsrchr.m4 (gl_PREREQ_MBSRCHR): Likewise.
* m4/mbssep.m4 (gl_PREREQ_MBSSEP): Likewise.
* m4/mbsspn.m4 (gl_PREREQ_MBSSPN): Likewise.
* m4/mbsstr.m4 (gl_PREREQ_MBSSTR): Likewise.
* m4/mbstok_r.m4 (gl_PREREQ_MBSTOK_R): Likewise.
* m4/mbswidth.m4 (gl_MBSWIDTH): Likewise.
* m4/quotearg.m4 (gl_QUOTEARG): Likewise.
* modules/trim (configure.ac): Likewise.
--- m4/mbrtowc.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbrtowc.m4 2008-12-18 00:39:40.000000000 +0100
@@ -1,15 +1,15 @@
-# mbrtowc.m4 serial 8
-dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc.
+# mbrtowc.m4 serial 9
+dnl Copyright (C) 2001-2002, 2004-2005, 2008 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.
dnl From Paul Eggert
-dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
-dnl AC_FUNC_MBRTOWC, when autoconf 2.60 can be assumed everywhere.
+dnl This override of an autoconf macro can be removed when autoconf 2.60 or
+dnl newer can be assumed everywhere.
-AC_DEFUN([gl_FUNC_MBRTOWC],
+AC_DEFUN([AC_FUNC_MBRTOWC],
[
dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
--- m4/mbfile.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbfile.m4 2008-12-18 00:42:43.000000000 +0100
@@ -1,5 +1,5 @@
-# mbfile.m4 serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# mbfile.m4 serial 3
+dnl Copyright (C) 2005, 2008 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.
@@ -12,6 +12,6 @@
AC_REQUIRE([AC_TYPE_MBSTATE_T])
dnl The following line is that so the user can test HAVE_MBRTOWC before
dnl #include "mbfile.h".
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbiter.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbiter.m4 2008-12-18 00:42:54.000000000 +0100
@@ -1,5 +1,5 @@
-# mbiter.m4 serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# mbiter.m4 serial 3
+dnl Copyright (C) 2005, 2008 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.
@@ -12,6 +12,6 @@
AC_REQUIRE([AC_TYPE_MBSTATE_T])
dnl The following line is that so the user can test HAVE_MBRTOWC before
dnl #include "mbiter.h" or "mbuiter.h".
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbscasecmp.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbscasecmp.m4 2008-12-18 00:42:37.000000000 +0100
@@ -1,5 +1,5 @@
-# mbscasecmp.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbscasecmp.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbscasecmp.c.
AC_DEFUN([gl_PREREQ_MBSCASECMP], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbscasestr.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbscasestr.m4 2008-12-18 00:42:22.000000000 +0100
@@ -1,5 +1,5 @@
-# mbscasestr.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbscasestr.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbscasestr.c.
AC_DEFUN([gl_PREREQ_MBSCASESTR], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbschr.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbschr.m4 2008-12-18 00:42:28.000000000 +0100
@@ -1,5 +1,5 @@
-# mbschr.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbschr.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbschr.c.
AC_DEFUN([gl_PREREQ_MBSCHR], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbscspn.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbscspn.m4 2008-12-18 00:41:54.000000000 +0100
@@ -1,5 +1,5 @@
-# mbscspn.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbscspn.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbscspn.c.
AC_DEFUN([gl_PREREQ_MBSCSPN], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbslen.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbslen.m4 2008-12-18 00:43:25.000000000 +0100
@@ -1,5 +1,5 @@
-# mbslen.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbslen.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbslen.c.
AC_DEFUN([gl_PREREQ_MBSLEN], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbsncasecmp.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbsncasecmp.m4 2008-12-18 00:42:18.000000000 +0100
@@ -1,5 +1,5 @@
-# mbsncasecmp.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbsncasecmp.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbsncasecmp.c.
AC_DEFUN([gl_PREREQ_MBSNCASECMP], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbsnlen.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbsnlen.m4 2008-12-18 00:43:05.000000000 +0100
@@ -1,5 +1,5 @@
-# mbsnlen.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbsnlen.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbsnlen.c.
AC_DEFUN([gl_PREREQ_MBSNLEN], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbspbrk.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbspbrk.m4 2008-12-18 00:43:46.000000000 +0100
@@ -1,5 +1,5 @@
-# mbspbrk.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbspbrk.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbspbrk.c.
AC_DEFUN([gl_PREREQ_MBSPBRK], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbspcasecmp.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbspcasecmp.m4 2008-12-18 00:43:34.000000000 +0100
@@ -1,5 +1,5 @@
-# mbspcasecmp.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbspcasecmp.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbspcasecmp.c.
AC_DEFUN([gl_PREREQ_MBSPCASECMP], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbsrchr.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbsrchr.m4 2008-12-18 00:42:33.000000000 +0100
@@ -1,5 +1,5 @@
-# mbsrchr.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbsrchr.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbsrchr.c.
AC_DEFUN([gl_PREREQ_MBSRCHR], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbssep.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbssep.m4 2008-12-18 00:42:49.000000000 +0100
@@ -1,5 +1,5 @@
-# mbssep.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbssep.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbssep.c.
AC_DEFUN([gl_PREREQ_MBSSEP], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbsspn.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbsspn.m4 2008-12-18 00:43:29.000000000 +0100
@@ -1,5 +1,5 @@
-# mbsspn.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbsspn.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbsspn.c.
AC_DEFUN([gl_PREREQ_MBSSPN], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbsstr.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbsstr.m4 2008-12-18 00:43:38.000000000 +0100
@@ -1,5 +1,5 @@
-# mbsstr.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbsstr.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbsstr.c.
AC_DEFUN([gl_PREREQ_MBSSTR], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbstok_r.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbstok_r.m4 2008-12-18 00:43:42.000000000 +0100
@@ -1,5 +1,5 @@
-# mbstok_r.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# mbstok_r.m4 serial 2
+dnl Copyright (C) 2007-2008 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.
@@ -11,6 +11,6 @@
# Prerequisites of lib/mbstok_r.c.
AC_DEFUN([gl_PREREQ_MBSTOK_R], [
- AC_REQUIRE([gl_FUNC_MBRTOWC])
+ AC_REQUIRE([AC_FUNC_MBRTOWC])
:
])
--- m4/mbswidth.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/mbswidth.m4 2008-12-18 00:43:18.000000000 +0100
@@ -1,5 +1,5 @@
-# mbswidth.m4 serial 14
-dnl Copyright (C) 2000-2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+# mbswidth.m4 serial 15
+dnl Copyright (C) 2000-2002, 2004, 2006-2008 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.
@@ -11,7 +11,7 @@
[
AC_CHECK_HEADERS_ONCE([wchar.h])
AC_CHECK_FUNCS_ONCE([isascii mbsinit])
- gl_FUNC_MBRTOWC
+ AC_FUNC_MBRTOWC
dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth()
dnl that clashes with ours.
--- m4/quotearg.m4.orig 2008-12-18 00:46:57.000000000 +0100
+++ m4/quotearg.m4 2008-12-18 00:42:08.000000000 +0100
@@ -1,5 +1,5 @@
-# quotearg.m4 serial 6
-dnl Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# quotearg.m4 serial 7
+dnl Copyright (C) 2002, 2004-2008 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.
@@ -11,5 +11,5 @@
dnl Prerequisites of lib/quotearg.c.
AC_CHECK_FUNCS_ONCE([mbsinit])
AC_TYPE_MBSTATE_T
- gl_FUNC_MBRTOWC
+ AC_FUNC_MBRTOWC
])
--- modules/trim.orig 2008-12-18 00:46:57.000000000 +0100
+++ modules/trim 2008-12-18 00:40:31.000000000 +0100
@@ -13,7 +13,7 @@
strdup
configure.ac:
-gl_FUNC_MBRTOWC
+AC_FUNC_MBRTOWC
Makefile.am:
lib_SOURCES += trim.c
