Mercurial > gnulib

changeset 31077:b3c571147a3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Followup to 2008-12-22: Remove unnecessary AC_FUNC_MBRTOWC invocations.
author Bruno Haible <bruno@clisp.org>
date Tue, 10 Mar 2009 01:19:40 +0100
parents 243a76ce4b29
children 24c76a2793f5
files ChangeLog m4/mbscasecmp.m4 m4/mbscasestr.m4 m4/mbschr.m4 m4/mbscspn.m4 m4/mbslen.m4 m4/mbsncasecmp.m4 m4/mbsnlen.m4 m4/mbspbrk.m4 m4/mbspcasecmp.m4 m4/mbsrchr.m4 m4/mbssep.m4 m4/mbsspn.m4 m4/mbsstr.m4 m4/mbstok_r.m4 m4/mbswidth.m4 m4/quotearg.m4 modules/mbscasecmp modules/mbscasestr modules/mbschr modules/mbscspn modules/mbslen modules/mbsncasecmp modules/mbsnlen modules/mbspbrk modules/mbspcasecmp modules/mbsrchr modules/mbssep modules/mbsspn modules/mbsstr modules/mbstok_r modules/trim
diffstat 32 files changed, 71 insertions(+), 276 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 09 13:05:02 2009 +0100
+++ b/ChangeLog	Tue Mar 10 01:19:40 2009 +0100
@@ -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'.
--- a/m4/mbscasecmp.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbscasestr.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbschr.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbscspn.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbslen.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbsncasecmp.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbsnlen.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbspbrk.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbspcasecmp.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbsrchr.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbssep.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbsspn.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbsstr.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbstok_r.m4	Mon Mar 09 13:05:02 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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])
-  :
-])
--- a/m4/mbswidth.m4	Mon Mar 09 13:05:02 2009 +0100
+++ b/m4/mbswidth.m4	Tue Mar 10 01:19:40 2009 +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.
--- a/m4/quotearg.m4	Mon Mar 09 13:05:02 2009 +0100
+++ b/m4/quotearg.m4	Tue Mar 10 01:19:40 2009 +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
 ])
--- a/modules/mbscasecmp	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbscasecmp	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbscasestr	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbscasestr	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbschr	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbschr	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbscspn	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbscspn	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbslen	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbslen	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbsncasecmp	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbsncasecmp	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbsnlen	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbsnlen	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbspbrk	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbspbrk	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbspcasecmp	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbspcasecmp	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbsrchr	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbsrchr	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbssep	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbssep	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbsspn	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbsspn	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbsstr	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbsstr	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/mbstok_r	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/mbstok_r	Tue Mar 10 01:19:40 2009 +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:
--- a/modules/trim	Mon Mar 09 13:05:02 2009 +0100
+++ b/modules/trim	Tue Mar 10 01:19:40 2009 +0100
@@ -13,7 +13,6 @@
 strdup
 
 configure.ac:
-AC_FUNC_MBRTOWC
 
 Makefile.am:
 lib_SOURCES += trim.c