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

32 files changed, 71 insertions, 276 deletions

diff --git a/ChangeLog b/ChangeLog
index 081f281adf..f16e41180c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2009-03-09  Bruno Haible  <bruno@clisp.org>
+
+	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.
+
 2009-03-08  Bruno Haible  <bruno@clisp.org>
 
 	Tests for module 'unicase/ulc-casecmp'.
diff --git a/m4/mbscasecmp.m4 b/m4/mbscasecmp.m4
deleted file mode 100644
index d76d10f5ab..0000000000
--- a/m4/mbscasecmp.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSCASECMP],
-[
-  gl_PREREQ_MBSCASECMP
-])
-
-# Prerequisites of lib/mbscasecmp.c.
-AC_DEFUN([gl_PREREQ_MBSCASECMP], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbscasestr.m4 b/m4/mbscasestr.m4
deleted file mode 100644
index e4e8524af9..0000000000
--- a/m4/mbscasestr.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSCASESTR],
-[
-  gl_PREREQ_MBSCASESTR
-])
-
-# Prerequisites of lib/mbscasestr.c.
-AC_DEFUN([gl_PREREQ_MBSCASESTR], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbschr.m4 b/m4/mbschr.m4
deleted file mode 100644
index 413eb7b9bd..0000000000
--- a/m4/mbschr.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSCHR],
-[
-  gl_PREREQ_MBSCHR
-])
-
-# Prerequisites of lib/mbschr.c.
-AC_DEFUN([gl_PREREQ_MBSCHR], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbscspn.m4 b/m4/mbscspn.m4
deleted file mode 100644
index aad9ab8ec7..0000000000
--- a/m4/mbscspn.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSCSPN],
-[
-  gl_PREREQ_MBSCSPN
-])
-
-# Prerequisites of lib/mbscspn.c.
-AC_DEFUN([gl_PREREQ_MBSCSPN], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbslen.m4 b/m4/mbslen.m4
deleted file mode 100644
index 91e95a1322..0000000000
--- a/m4/mbslen.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSLEN],
-[
-  gl_PREREQ_MBSLEN
-])
-
-# Prerequisites of lib/mbslen.c.
-AC_DEFUN([gl_PREREQ_MBSLEN], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbsncasecmp.m4 b/m4/mbsncasecmp.m4
deleted file mode 100644
index f23c3e74f8..0000000000
--- a/m4/mbsncasecmp.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSNCASECMP],
-[
-  gl_PREREQ_MBSNCASECMP
-])
-
-# Prerequisites of lib/mbsncasecmp.c.
-AC_DEFUN([gl_PREREQ_MBSNCASECMP], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbsnlen.m4 b/m4/mbsnlen.m4
deleted file mode 100644
index 422a980d55..0000000000
--- a/m4/mbsnlen.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSNLEN],
-[
-  gl_PREREQ_MBSNLEN
-])
-
-# Prerequisites of lib/mbsnlen.c.
-AC_DEFUN([gl_PREREQ_MBSNLEN], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbspbrk.m4 b/m4/mbspbrk.m4
deleted file mode 100644
index c1f041ca50..0000000000
--- a/m4/mbspbrk.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSPBRK],
-[
-  gl_PREREQ_MBSPBRK
-])
-
-# Prerequisites of lib/mbspbrk.c.
-AC_DEFUN([gl_PREREQ_MBSPBRK], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbspcasecmp.m4 b/m4/mbspcasecmp.m4
deleted file mode 100644
index ef8c2453bf..0000000000
--- a/m4/mbspcasecmp.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSPCASECMP],
-[
-  gl_PREREQ_MBSPCASECMP
-])
-
-# Prerequisites of lib/mbspcasecmp.c.
-AC_DEFUN([gl_PREREQ_MBSPCASECMP], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbsrchr.m4 b/m4/mbsrchr.m4
deleted file mode 100644
index 2aca5442b6..0000000000
--- a/m4/mbsrchr.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSRCHR],
-[
-  gl_PREREQ_MBSRCHR
-])
-
-# Prerequisites of lib/mbsrchr.c.
-AC_DEFUN([gl_PREREQ_MBSRCHR], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbssep.m4 b/m4/mbssep.m4
deleted file mode 100644
index cb42c9f3a7..0000000000
--- a/m4/mbssep.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSSEP],
-[
-  gl_PREREQ_MBSSEP
-])
-
-# Prerequisites of lib/mbssep.c.
-AC_DEFUN([gl_PREREQ_MBSSEP], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbsspn.m4 b/m4/mbsspn.m4
deleted file mode 100644
index 02476c3858..0000000000
--- a/m4/mbsspn.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSSPN],
-[
-  gl_PREREQ_MBSSPN
-])
-
-# Prerequisites of lib/mbsspn.c.
-AC_DEFUN([gl_PREREQ_MBSSPN], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbsstr.m4 b/m4/mbsstr.m4
deleted file mode 100644
index 8be4771079..0000000000
--- a/m4/mbsstr.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSSTR],
-[
-  gl_PREREQ_MBSSTR
-])
-
-# Prerequisites of lib/mbsstr.c.
-AC_DEFUN([gl_PREREQ_MBSSTR], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbstok_r.m4 b/m4/mbstok_r.m4
deleted file mode 100644
index f28c5d187c..0000000000
--- a/m4/mbstok_r.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-AC_DEFUN([gl_FUNC_MBSTOK_R],
-[
-  gl_PREREQ_MBSTOK_R
-])
-
-# Prerequisites of lib/mbstok_r.c.
-AC_DEFUN([gl_PREREQ_MBSTOK_R], [
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  :
-])
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 2fda87bc4a..fcd0a68c8e 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -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_DEFUN([gl_MBSWIDTH],
 [
   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.
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index 88478612fb..eec9e686c0 100644
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -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 @@ dnl with or without modifications, as long as this notice is preserved.
 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
 ])
diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index e89948e517..731815297a 100644
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -3,15 +3,12 @@ mbscasecmp() function: case-insensitive string comparison.
 
 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:
diff --git a/modules/mbscasestr b/modules/mbscasestr
index 994d471f1c..7d4a614906 100644
--- a/modules/mbscasestr
+++ b/modules/mbscasestr
@@ -4,8 +4,6 @@ mbscasestr() function: case-insensitive search for a substring in a string.
 Files:
 lib/mbscasestr.c
 lib/str-kmp.h
-m4/mbscasestr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -16,7 +14,6 @@ malloca
 strnlen
 
 configure.ac:
-gl_FUNC_MBSCASESTR
 gl_STRING_MODULE_INDICATOR([mbscasestr])
 
 Makefile.am:
diff --git a/modules/mbschr b/modules/mbschr
index 1407eeae1e..8bd2b29eb3 100644
--- a/modules/mbschr
+++ b/modules/mbschr
@@ -3,15 +3,12 @@ mbschr() function: search a string for a character.
 
 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:
diff --git a/modules/mbscspn b/modules/mbscspn
index c24e5cc994..ecea4a8e1e 100644
--- a/modules/mbscspn
+++ b/modules/mbscspn
@@ -3,8 +3,6 @@ mbscspn() function: search a string for any of a set of characters.
 
 Files:
 lib/mbscspn.c
-m4/mbscspn.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@ mbschr
 strcspn
 
 configure.ac:
-gl_FUNC_MBSCSPN
 gl_STRING_MODULE_INDICATOR([mbscspn])
 
 Makefile.am:
diff --git a/modules/mbslen b/modules/mbslen
index 47d7ab581d..9374c93747 100644
--- a/modules/mbslen
+++ b/modules/mbslen
@@ -3,15 +3,12 @@ mbslen() function: Determine the number of multibyte characters in a string.
 
 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:
diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp
index 05aac0d490..34cb0530a8 100644
--- a/modules/mbsncasecmp
+++ b/modules/mbsncasecmp
@@ -3,15 +3,12 @@ mbsncasecmp() function: case-insensitive string prefix comparison.
 
 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:
diff --git a/modules/mbsnlen b/modules/mbsnlen
index 59f0f942e2..568d48596e 100644
--- a/modules/mbsnlen
+++ b/modules/mbsnlen
@@ -3,15 +3,12 @@ mbsnlen() function: Determine the number of multibyte characters in a string.
 
 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:
diff --git a/modules/mbspbrk b/modules/mbspbrk
index 79c9afd7c7..80d5133459 100644
--- a/modules/mbspbrk
+++ b/modules/mbspbrk
@@ -3,8 +3,6 @@ mbspbrk() function: search a string for any of a set of characters.
 
 Files:
 lib/mbspbrk.c
-m4/mbspbrk.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@ mbschr
 strpbrk
 
 configure.ac:
-gl_FUNC_MBSPBRK
 gl_STRING_MODULE_INDICATOR([mbspbrk])
 
 Makefile.am:
diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp
index e84a48e0d9..c3e59c02ce 100644
--- a/modules/mbspcasecmp
+++ b/modules/mbspcasecmp
@@ -3,15 +3,12 @@ mbspcasecmp() function: case-insensitive string prefix comparison.
 
 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:
diff --git a/modules/mbsrchr b/modules/mbsrchr
index 2ff7b38856..7d4f247325 100644
--- a/modules/mbsrchr
+++ b/modules/mbsrchr
@@ -3,15 +3,12 @@ mbsrchr() function: search a string for a character, from the end.
 
 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:
diff --git a/modules/mbssep b/modules/mbssep
index 2e50c984bb..2e30c5c194 100644
--- a/modules/mbssep
+++ b/modules/mbssep
@@ -3,8 +3,6 @@ mbssep() function: split string into tokens, thread safe.
 
 Files:
 lib/mbssep.c
-m4/mbssep.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -13,7 +11,6 @@ mbspbrk
 strsep
 
 configure.ac:
-gl_FUNC_MBSSEP
 gl_STRING_MODULE_INDICATOR([mbssep])
 
 Makefile.am:
diff --git a/modules/mbsspn b/modules/mbsspn
index 7d6ee606b0..f0bc950f8d 100644
--- a/modules/mbsspn
+++ b/modules/mbsspn
@@ -3,8 +3,6 @@ mbsspn() function: search a string for any outside a set of characters.
 
 Files:
 lib/mbsspn.c
-m4/mbsspn.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -12,7 +10,6 @@ string
 mbschr
 
 configure.ac:
-gl_FUNC_MBSSPN
 gl_STRING_MODULE_INDICATOR([mbsspn])
 
 Makefile.am:
diff --git a/modules/mbsstr b/modules/mbsstr
index 6530783332..7a68edc3fa 100644
--- a/modules/mbsstr
+++ b/modules/mbsstr
@@ -4,8 +4,6 @@ mbsstr() function: search for a substring in a string.
 Files:
 lib/mbsstr.c
 lib/str-kmp.h
-m4/mbsstr.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -16,7 +14,6 @@ malloca
 strnlen
 
 configure.ac:
-gl_FUNC_MBSSTR
 gl_STRING_MODULE_INDICATOR([mbsstr])
 
 Makefile.am:
diff --git a/modules/mbstok_r b/modules/mbstok_r
index 2aab0848bd..c51be5410b 100644
--- a/modules/mbstok_r
+++ b/modules/mbstok_r
@@ -3,8 +3,6 @@ mbstok_r() function: split string into tokens, thread safe.
 
 Files:
 lib/mbstok_r.c
-m4/mbstok_r.m4
-m4/mbrtowc.m4
 
 Depends-on:
 mbuiter
@@ -14,7 +12,6 @@ mbspbrk
 strtok_r
 
 configure.ac:
-gl_FUNC_MBSTOK_R
 gl_STRING_MODULE_INDICATOR([mbstok_r])
 
 Makefile.am:
diff --git a/modules/trim b/modules/trim
index 645da5d216..42d5b76143 100644
--- a/modules/trim
+++ b/modules/trim
@@ -13,7 +13,6 @@ memmove
 strdup
 
 configure.ac:
-AC_FUNC_MBRTOWC
 
 Makefile.am:
 lib_SOURCES += trim.c