From b3fa560fc4c942ef4896fe1360c34c26c930d830 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 18 Dec 2008 00:57:10 +0100 Subject: [PATCH] Rename gl_FUNC_MBRTOWC to AC_FUNC_MBRTOWC. --- ChangeLog | 24 ++++++++++++++++++++++++ m4/mbfile.m4 | 6 +++--- m4/mbiter.m4 | 6 +++--- m4/mbrtowc.m4 | 10 +++++----- m4/mbscasecmp.m4 | 6 +++--- m4/mbscasestr.m4 | 6 +++--- m4/mbschr.m4 | 6 +++--- m4/mbscspn.m4 | 6 +++--- m4/mbslen.m4 | 6 +++--- m4/mbsncasecmp.m4 | 6 +++--- m4/mbsnlen.m4 | 6 +++--- m4/mbspbrk.m4 | 6 +++--- m4/mbspcasecmp.m4 | 6 +++--- m4/mbsrchr.m4 | 6 +++--- m4/mbssep.m4 | 6 +++--- m4/mbsspn.m4 | 6 +++--- m4/mbsstr.m4 | 6 +++--- m4/mbstok_r.m4 | 6 +++--- m4/mbswidth.m4 | 6 +++--- m4/quotearg.m4 | 6 +++--- modules/trim | 2 +- 21 files changed, 84 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6eee153e..e6af381c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ 2008-12-17 Bruno Haible + * 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 + * modules/btowc-tests: New file. * tests/test-btowc1.sh: New file. * tests/test-btowc2.sh: New file. diff --git a/m4/mbfile.m4 b/m4/mbfile.m4 index 032bc996e..d2fc3c454 100644 --- 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_DEFUN([gl_MBFILE], 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]) : ]) diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 7d51af10d..828376878 100644 --- 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_DEFUN([gl_MBITER], 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]) : ]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index a3bd9114c..16ad6ca15 100644 --- 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], diff --git a/m4/mbscasecmp.m4 b/m4/mbscasecmp.m4 index 735776993..d76d10f5a 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSCASECMP], # Prerequisites of lib/mbscasecmp.c. AC_DEFUN([gl_PREREQ_MBSCASECMP], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbscasestr.m4 b/m4/mbscasestr.m4 index 88f50c3ee..e4e8524af 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSCASESTR], # Prerequisites of lib/mbscasestr.c. AC_DEFUN([gl_PREREQ_MBSCASESTR], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbschr.m4 b/m4/mbschr.m4 index 92fb61847..413eb7b9b 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSCHR], # Prerequisites of lib/mbschr.c. AC_DEFUN([gl_PREREQ_MBSCHR], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbscspn.m4 b/m4/mbscspn.m4 index a48b66edd..aad9ab8ec 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSCSPN], # Prerequisites of lib/mbscspn.c. AC_DEFUN([gl_PREREQ_MBSCSPN], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbslen.m4 b/m4/mbslen.m4 index dad8a8cf6..91e95a132 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSLEN], # Prerequisites of lib/mbslen.c. AC_DEFUN([gl_PREREQ_MBSLEN], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsncasecmp.m4 b/m4/mbsncasecmp.m4 index e59032034..f23c3e74f 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSNCASECMP], # Prerequisites of lib/mbsncasecmp.c. AC_DEFUN([gl_PREREQ_MBSNCASECMP], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsnlen.m4 b/m4/mbsnlen.m4 index 1b715ddb6..422a980d5 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSNLEN], # Prerequisites of lib/mbsnlen.c. AC_DEFUN([gl_PREREQ_MBSNLEN], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbspbrk.m4 b/m4/mbspbrk.m4 index c4700a069..c1f041ca5 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSPBRK], # Prerequisites of lib/mbspbrk.c. AC_DEFUN([gl_PREREQ_MBSPBRK], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbspcasecmp.m4 b/m4/mbspcasecmp.m4 index ce1672ffd..ef8c2453b 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSPCASECMP], # Prerequisites of lib/mbspcasecmp.c. AC_DEFUN([gl_PREREQ_MBSPCASECMP], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsrchr.m4 b/m4/mbsrchr.m4 index 79d46dc24..2aca5442b 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSRCHR], # Prerequisites of lib/mbsrchr.c. AC_DEFUN([gl_PREREQ_MBSRCHR], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbssep.m4 b/m4/mbssep.m4 index 1a44abae5..cb42c9f3a 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSSEP], # Prerequisites of lib/mbssep.c. AC_DEFUN([gl_PREREQ_MBSSEP], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsspn.m4 b/m4/mbsspn.m4 index 2359c101b..02476c385 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSSPN], # Prerequisites of lib/mbsspn.c. AC_DEFUN([gl_PREREQ_MBSSPN], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsstr.m4 b/m4/mbsstr.m4 index cec117f45..8be477107 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSSTR], # Prerequisites of lib/mbsstr.c. AC_DEFUN([gl_PREREQ_MBSSTR], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbstok_r.m4 b/m4/mbstok_r.m4 index b1a03da17..f28c5d187 100644 --- 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 @@ AC_DEFUN([gl_FUNC_MBSTOK_R], # Prerequisites of lib/mbstok_r.c. AC_DEFUN([gl_PREREQ_MBSTOK_R], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index 241865fb4..82ebe4425 100644 --- 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_DEFUN([gl_MBSWIDTH], [ AC_CHECK_HEADERS_ONCE([wchar.h]) AC_CHECK_FUNCS_ONCE([isascii mbsinit]) - gl_FUNC_MBRTOWC + AC_FUNC_MBRTOWC dnl UnixWare 7.1.1 has a declaration of a function mbswidth() dnl that clashes with ours. diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index db635d05f..88478612f 100644 --- 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 @@ AC_DEFUN([gl_QUOTEARG], dnl Prerequisites of lib/quotearg.c. AC_CHECK_FUNCS_ONCE([mbsinit]) AC_TYPE_MBSTATE_T - gl_FUNC_MBRTOWC + AC_FUNC_MBRTOWC ]) diff --git a/modules/trim b/modules/trim index af0986930..645da5d21 100644 --- a/modules/trim +++ b/modules/trim @@ -13,7 +13,7 @@ memmove strdup configure.ac: -gl_FUNC_MBRTOWC +AC_FUNC_MBRTOWC Makefile.am: lib_SOURCES += trim.c -- 2.11.0