diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-05-21 15:18:46 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-06-16 00:06:29 +0200 |
| commit | 8e08af9e7f4ebbb06ebf5280b2be4d33c9d55b6e (patch) | |
| tree | c76ec5ca4cb3a34c3db0b8665a986ef01076b99e /m4/memmem.m4 | |
| parent | beb9fe0c8dd1b29b1f8ae3429dc1229c39ef5cbc (diff) | |
| download | gnulib-8e08af9e7f4ebbb06ebf5280b2be4d33c9d55b6e.tar.gz | |
memmem*: Move AC_LIBOBJ invocations to module description.
* m4/memmem.m4 (gl_FUNC_MEMMEM_SIMPLE): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Set HAVE_MEMMEM. Move AC_LIBOBJ invocations from
here...
(gl_FUNC_MEMMEM): ... and here...
* modules/memmem-simple (configure.ac): ... to here.
* modules/memmem (configure.ac): ... and here.
Diffstat (limited to 'm4/memmem.m4')
| -rw-r--r-- | m4/memmem.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/m4/memmem.m4 b/m4/memmem.m4 index dae71a968c..e912205cd0 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,4 +1,4 @@ -# memmem.m4 serial 22 +# memmem.m4 serial 23 dnl Copyright (C) 2002-2004, 2007-2011 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,12 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS([memmem]) + AC_CHECK_FUNCS([memmem]) + if test $ac_cv_func_memmem = yes; then + HAVE_MEMMEM=1 + else + HAVE_MEMMEM=0 + fi AC_CHECK_DECLS_ONCE([memmem]) if test $ac_cv_have_decl_memmem = no; then HAVE_DECL_MEMMEM=0 @@ -68,7 +73,6 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE], ]) if test "$gl_cv_func_memmem_works_always" != yes; then REPLACE_MEMMEM=1 - AC_LIBOBJ([memmem]) fi fi gl_PREREQ_MEMMEM @@ -133,7 +137,6 @@ static void quit (int sig) { exit (sig + 128); } ]) if test "$gl_cv_func_memmem_works_fast" != yes; then REPLACE_MEMMEM=1 - AC_LIBOBJ([memmem]) fi fi ]) # gl_FUNC_MEMMEM |