Mercurial > hg > octave-jordi > gnulib-hg
changeset 14941:56ef3f2912e0
fnmatch, fnmatch-gnu: Move AC_LIBOBJ invocations to module description.
* m4/fnmatch.m4 (gl_PREREQ_FNMATCH): New macro, extracted from
gl_FUNC_FNMATCH_POSIX.
(gl_FUNC_FNMATCH_POSIX): Move AC_LIBOBJ and gl_PREREQ_FNMATCH
invocations from here...
* modules/fnmatch (configure.ac): ... to here.
* modules/fnmatch-gnu (configure.ac): ... and here.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 07 May 2011 12:13:04 +0200 |
| parents | edad1aa593fe |
| children | 4865e1e7bc02 |
| files | ChangeLog m4/fnmatch.m4 modules/fnmatch modules/fnmatch-gnu |
| diffstat | 4 files changed, 33 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-05-07 Bruno Haible <bruno@clisp.org> + + fnmatch, fnmatch-gnu: Move AC_LIBOBJ invocations to module description. + * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): New macro, extracted from + gl_FUNC_FNMATCH_POSIX. + (gl_FUNC_FNMATCH_POSIX): Move AC_LIBOBJ and gl_PREREQ_FNMATCH + invocations from here... + * modules/fnmatch (configure.ac): ... to here. + * modules/fnmatch-gnu (configure.ac): ... and here. + 2011-05-07 Bruno Haible <bruno@clisp.org> flock: Move AC_LIBOBJ invocations to module description.
--- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,4 +1,4 @@ -# Check for fnmatch - serial 6. +# Check for fnmatch - serial 7. # Copyright (C) 2000-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -128,17 +128,6 @@ rm -f "$gl_source_base/fnmatch.h" else FNMATCH_H=fnmatch.h - AC_LIBOBJ([fnmatch]) - dnl We must choose a different name for our function, since on ELF systems - dnl a broken fnmatch() in libc.so would override our fnmatch() if it is - dnl compiled into a shared library. - AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch], - [Define to a replacement function name for fnmatch().]) - dnl Prerequisites of lib/fnmatch.c. - AC_REQUIRE([AC_TYPE_MBSTATE_T]) - AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>]) - AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy]) - AC_CHECK_HEADERS_ONCE([wctype.h]) fi AC_SUBST([FNMATCH_H]) AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"]) @@ -151,3 +140,17 @@ AC_REQUIRE([gl_FUNC_FNMATCH_POSIX]) ]) + +AC_DEFUN([gl_PREREQ_FNMATCH], +[ + dnl We must choose a different name for our function, since on ELF systems + dnl a broken fnmatch() in libc.so would override our fnmatch() if it is + dnl compiled into a shared library. + AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch], + [Define to a replacement function name for fnmatch().]) + dnl Prerequisites of lib/fnmatch.c. + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>]) + AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy]) + AC_CHECK_HEADERS_ONCE([wctype.h]) +])