remove unnecessary AC_FUNC_MBRTOWC invocations

[Bruno Haible]

On 2008-12-22, I removed many uses of HAVE_MBRTOWC. (Recall that we now have
an mbrtowc emulation for all platforms that lack it.) This commit cleans up
the autoconf macros accordingly.


2009-03-09  Bruno Haible  <address@hidden>

        Followup to 2008-12-22 commit: Remove unnecessary AC_FUNC_MBRTOWC
        invocations.

        * m4/mbscasecmp.m4: Remove file.
        * modules/mbscasecmp (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSCASECMP invocation.

        * m4/mbscasestr.m4: Remove file.
        * modules/mbscasestr (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSCASESTR invocation.

        * m4/mbschr.m4: Remove file.
        * modules/mbschr (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSCHR invocation.

        * m4/mbscspn.m4: Remove file.
        * modules/mbscspn (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSCSPN invocation.

        * m4/mbslen.m4: Remove file.
        * modules/mbslen (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSLEN invocation.

        * m4/mbsncasecmp.m4: Remove file.
        * modules/mbsncasecmp (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSNCASECMP invocation.

        * m4/mbsnlen.m4: Remove file.
        * modules/mbsnlen (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSNLEN invocation.

        * m4/mbspbrk.m4: Remove file.
        * modules/mbspbrk (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSPBRK invocation.

        * m4/mbspcasecmp.m4: Remove file.
        * modules/mbspcasecmp (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSPCASECMP invocation.

        * m4/mbsrchr.m4: Remove file.
        * modules/mbsrchr (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSRCHR invocation.

        * m4/mbssep.m4: Remove file.
        * modules/mbssep (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSSEP invocation.

        * m4/mbsspn.m4: Remove file.
        * modules/mbsspn (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSSPN invocation.

        * m4/mbsstr.m4: Remove file.
        * modules/mbsstr (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSSTR invocation.

        * m4/mbstok_r.m4: Remove file.
        * modules/mbstok_r (Files): Remove it and m4/mbrtowc.m4
        (configure.ac): Remove gl_FUNC_MBSTOK_R invocation.

        * m4/mbswidth.m4 (gl_MBSWIDTH): Remove AC_FUNC_MBRTOWC invocation.

        * m4/quotearg.m4 (gl_QUOTEARG): Remove mbsinit test and
        AC_TYPE_MBSTATE_T, AC_FUNC_MBRTOWC invocations.

        * modules/trim (configure.ac): Remove AC_FUNC_MBRTOWC invocation.

--- m4/mbswidth.m4.orig 2009-03-10 01:06:57.000000000 +0100
+++ m4/mbswidth.m4      2009-03-10 00:58:11.000000000 +0100
@@ -1,4 +1,4 @@
-# mbswidth.m4 serial 16
+# mbswidth.m4 serial 17
 dnl Copyright (C) 2000-2002, 2004, 2006-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,6 @@
 [
   AC_CHECK_HEADERS_ONCE([wchar.h])
   AC_CHECK_FUNCS_ONCE([isascii mbsinit])
-  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 2009-03-10 01:06:57.000000000 +0100
+++ m4/quotearg.m4      2009-03-10 00:59:31.000000000 +0100
@@ -1,5 +1,5 @@
-# quotearg.m4 serial 7
-dnl Copyright (C) 2002, 2004-2008 Free Software Foundation, Inc.
+# quotearg.m4 serial 8
+dnl Copyright (C) 2002, 2004-2009 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.
@@ -7,9 +7,4 @@
 AC_DEFUN([gl_QUOTEARG],
 [
   AC_LIBOBJ([quotearg])
-
-  dnl Prerequisites of lib/quotearg.c.
-  AC_CHECK_FUNCS_ONCE([mbsinit])
-  AC_TYPE_MBSTATE_T
-  AC_FUNC_MBRTOWC
 ])
--- modules/mbscasecmp.orig     2009-03-10 01:06:57.000000000 +0100
+++ modules/mbscasecmp  2009-03-10 00:52:08.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbscasecmp.c
-m4/mbscasecmp.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSCASECMP
 gl_STRING_MODULE_INDICATOR([mbscasecmp])
 
 Makefile.am:
--- modules/mbscasestr.orig     2009-03-10 01:06:57.000000000 +0100
+++ modules/mbscasestr  2009-03-10 00:52:43.000000000 +0100
@@ -4,8 +4,6 @@
 Files:
 lib/mbscasestr.c
 lib/str-kmp.h
-m4/mbscasestr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -16,7 +14,6 @@
 strnlen
 
 configure.ac:
-gl_FUNC_MBSCASESTR
 gl_STRING_MODULE_INDICATOR([mbscasestr])
 
 Makefile.am:
--- modules/mbschr.orig 2009-03-10 01:06:57.000000000 +0100
+++ modules/mbschr      2009-03-10 00:53:17.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbschr.c
-m4/mbschr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSCHR
 gl_STRING_MODULE_INDICATOR([mbschr])
 
 Makefile.am:
--- modules/mbscspn.orig        2009-03-10 01:06:57.000000000 +0100
+++ modules/mbscspn     2009-03-10 00:53:46.000000000 +0100
@@ -3,8 +3,6 @@
 
 Files:
 lib/mbscspn.c
-m4/mbscspn.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@
 strcspn
 
 configure.ac:
-gl_FUNC_MBSCSPN
 gl_STRING_MODULE_INDICATOR([mbscspn])
 
 Makefile.am:
--- modules/mbslen.orig 2009-03-10 01:06:57.000000000 +0100
+++ modules/mbslen      2009-03-10 00:54:09.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbslen.c
-m4/mbslen.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSLEN
 gl_STRING_MODULE_INDICATOR([mbslen])
 
 Makefile.am:
--- modules/mbsncasecmp.orig    2009-03-10 01:06:57.000000000 +0100
+++ modules/mbsncasecmp 2009-03-10 00:54:33.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbsncasecmp.c
-m4/mbsncasecmp.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSNCASECMP
 gl_STRING_MODULE_INDICATOR([mbsncasecmp])
 
 Makefile.am:
--- modules/mbsnlen.orig        2009-03-10 01:06:57.000000000 +0100
+++ modules/mbsnlen     2009-03-10 00:54:56.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbsnlen.c
-m4/mbsnlen.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbiter
 string
 
 configure.ac:
-gl_FUNC_MBSNLEN
 gl_STRING_MODULE_INDICATOR([mbsnlen])
 
 Makefile.am:
--- modules/mbspbrk.orig        2009-03-10 01:06:57.000000000 +0100
+++ modules/mbspbrk     2009-03-10 00:55:21.000000000 +0100
@@ -3,8 +3,6 @@
 
 Files:
 lib/mbspbrk.c
-m4/mbspbrk.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@
 strpbrk
 
 configure.ac:
-gl_FUNC_MBSPBRK
 gl_STRING_MODULE_INDICATOR([mbspbrk])
 
 Makefile.am:
--- modules/mbspcasecmp.orig    2009-03-10 01:06:57.000000000 +0100
+++ modules/mbspcasecmp 2009-03-10 00:55:43.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbspcasecmp.c
-m4/mbspcasecmp.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSPCASECMP
 gl_STRING_MODULE_INDICATOR([mbspcasecmp])
 
 Makefile.am:
--- modules/mbsrchr.orig        2009-03-10 01:06:57.000000000 +0100
+++ modules/mbsrchr     2009-03-10 00:56:13.000000000 +0100
@@ -3,15 +3,12 @@
 
 Files:
 lib/mbsrchr.c
-m4/mbsrchr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
 string
 
 configure.ac:
-gl_FUNC_MBSRCHR
 gl_STRING_MODULE_INDICATOR([mbsrchr])
 
 Makefile.am:
--- modules/mbssep.orig 2009-03-10 01:06:57.000000000 +0100
+++ modules/mbssep      2009-03-10 00:56:48.000000000 +0100
@@ -3,8 +3,6 @@
 
 Files:
 lib/mbssep.c
-m4/mbssep.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@
 strsep
 
 configure.ac:
-gl_FUNC_MBSSEP
 gl_STRING_MODULE_INDICATOR([mbssep])
 
 Makefile.am:
--- modules/mbsspn.orig 2009-03-10 01:06:57.000000000 +0100
+++ modules/mbsspn      2009-03-10 00:56:55.000000000 +0100
@@ -3,8 +3,6 @@
 
 Files:
 lib/mbsspn.c
-m4/mbsspn.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -12,7 +10,6 @@
 mbschr
 
 configure.ac:
-gl_FUNC_MBSSPN
 gl_STRING_MODULE_INDICATOR([mbsspn])
 
 Makefile.am:
--- modules/mbsstr.orig 2009-03-10 01:06:57.000000000 +0100
+++ modules/mbsstr      2009-03-10 00:57:38.000000000 +0100
@@ -4,8 +4,6 @@
 Files:
 lib/mbsstr.c
 lib/str-kmp.h
-m4/mbsstr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -16,7 +14,6 @@
 strnlen
 
 configure.ac:
-gl_FUNC_MBSSTR
 gl_STRING_MODULE_INDICATOR([mbsstr])
 
 Makefile.am:
--- modules/mbstok_r.orig       2009-03-10 01:06:57.000000000 +0100
+++ modules/mbstok_r    2009-03-10 00:57:44.000000000 +0100
@@ -3,8 +3,6 @@
 
 Files:
 lib/mbstok_r.c
-m4/mbstok_r.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -14,7 +12,6 @@
 strtok_r
 
 configure.ac:
-gl_FUNC_MBSTOK_R
 gl_STRING_MODULE_INDICATOR([mbstok_r])
 
 Makefile.am:
--- modules/trim.orig   2009-03-10 01:06:57.000000000 +0100
+++ modules/trim        2009-03-10 01:02:25.000000000 +0100
@@ -13,7 +13,6 @@
 strdup
 
 configure.ac:
-AC_FUNC_MBRTOWC
 
 Makefile.am:
 lib_SOURCES += trim.c