--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2008-12-17  Bruno Haible  <bruno@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.
+
 2008-12-17  Bruno Haible  <bruno@clisp.org>
 
 	* modules/btowc-tests: New file.

--- a/m4/mbfile.m4
+++ b/m4/mbfile.m4
@@ -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])
   :
 ])

--- a/m4/mbiter.m4
+++ b/m4/mbiter.m4
@@ -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])
   :
 ])

--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -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],

--- a/m4/mbscasecmp.m4
+++ b/m4/mbscasecmp.m4
@@ -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])
   :
 ])

--- a/m4/mbscasestr.m4
+++ b/m4/mbscasestr.m4
@@ -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])
   :
 ])

--- a/m4/mbschr.m4
+++ b/m4/mbschr.m4
@@ -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])
   :
 ])

--- a/m4/mbscspn.m4
+++ b/m4/mbscspn.m4
@@ -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])
   :
 ])

--- a/m4/mbslen.m4
+++ b/m4/mbslen.m4
@@ -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])
   :
 ])

--- a/m4/mbsncasecmp.m4
+++ b/m4/mbsncasecmp.m4
@@ -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])
   :
 ])

--- a/m4/mbsnlen.m4
+++ b/m4/mbsnlen.m4
@@ -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])
   :
 ])

--- a/m4/mbspbrk.m4
+++ b/m4/mbspbrk.m4
@@ -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])
   :
 ])

--- a/m4/mbspcasecmp.m4
+++ b/m4/mbspcasecmp.m4
@@ -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])
   :
 ])

--- a/m4/mbsrchr.m4
+++ b/m4/mbsrchr.m4
@@ -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])
   :
 ])

--- a/m4/mbssep.m4
+++ b/m4/mbssep.m4
@@ -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])
   :
 ])

--- a/m4/mbsspn.m4
+++ b/m4/mbsspn.m4
@@ -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])
   :
 ])

--- a/m4/mbsstr.m4
+++ b/m4/mbsstr.m4
@@ -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])
   :
 ])

--- a/m4/mbstok_r.m4
+++ b/m4/mbstok_r.m4
@@ -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])
   :
 ])

--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -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.

--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -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
 ])

--- a/modules/trim
+++ b/modules/trim
@@ -13,7 +13,7 @@
 strdup
 
 configure.ac:
-gl_FUNC_MBRTOWC
+AC_FUNC_MBRTOWC
 
 Makefile.am:
 lib_SOURCES += trim.c