From: Bruno Haible Date: Sat, 21 May 2011 13:09:15 +0000 (+0200) Subject: memcpy: Move AC_LIBOBJ invocations to module description. X-Git-Tag: v0.1~2488 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=beb9fe0c8dd1b29b1f8ae3429dc1229c39ef5cbc;p=gnulib.git memcpy: Move AC_LIBOBJ invocations to module description. * m4/memcpy.m4 (gl_FUNC_MEMCPY): Call AC_CHECK_FUNCS instead of AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMCPY invocations from here... * modules/memcpy (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index d02f9a6f6..74fa150fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-21 Bruno Haible + memcpy: Move AC_LIBOBJ invocations to module description. + * m4/memcpy.m4 (gl_FUNC_MEMCPY): Call AC_CHECK_FUNCS instead of + AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_MEMCPY invocations from + here... + * modules/memcpy (configure.ac): ... to here. + +2011-05-21 Bruno Haible + memcmp: Simplify autoconf macro. * m4/memcmp.m4 (gl_FUNC_MEMCMP): Merge the cross-compilation code into the AC_RUN_IFELSE invocation. Set gl_func_memcmp. diff --git a/m4/memcpy.m4 b/m4/memcpy.m4 index 62921d45b..9085f4452 100644 --- a/m4/memcpy.m4 +++ b/m4/memcpy.m4 @@ -1,4 +1,4 @@ -# memcpy.m4 serial 3 +# memcpy.m4 serial 4 dnl Copyright (C) 2002, 2009-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, @@ -6,10 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MEMCPY], [ - AC_REPLACE_FUNCS([memcpy]) - if test $ac_cv_func_memcpy = no; then - gl_PREREQ_MEMCPY - fi + AC_CHECK_FUNCS([memcpy]) ]) # Prerequisites of lib/memcpy.c. diff --git a/modules/memcpy b/modules/memcpy index 1758bdf8a..92f528f89 100644 --- a/modules/memcpy +++ b/modules/memcpy @@ -15,6 +15,10 @@ Depends-on: configure.ac: gl_FUNC_MEMCPY +if test $ac_cv_func_memcpy = no; then + AC_LIBOBJ([memcpy]) + gl_PREREQ_MEMCPY +fi Makefile.am: