diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-05-21 14:56:27 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-06-16 00:06:28 +0200 |
| commit | 676097df72d40340916b07c56257dda601e1fc2d (patch) | |
| tree | c99b3baa3b1c69448fa3741db82ccd57f08bef12 | |
| parent | 0447803a9a2d924f6dd0c4d0042256f065332b4e (diff) | |
| download | gnulib-676097df72d40340916b07c56257dda601e1fc2d.tar.gz | |
memcmp: Move AC_LIBOBJ invocations to module description.
* m4/memcmp.m4 (AC_FUNC_MEMCMP): Remove macro.
(gl_FUNC_MEMCMP): Inline it here. Set gl_cv_func_memcmp_working. Move
AC_LIBOBJ and gl_PREREQ_MEMCMP invocations from here...
* modules/memcmp (configure.ac): ... to here.
(Depends-on): Update conditions.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | m4/memcmp.m4 | 38 | ||||
| -rw-r--r-- | modules/memcmp | 6 |
3 files changed, 29 insertions, 24 deletions
@@ -1,5 +1,14 @@ 2011-05-21 Bruno Haible <bruno@clisp.org> + memcmp: Move AC_LIBOBJ invocations to module description. + * m4/memcmp.m4 (AC_FUNC_MEMCMP): Remove macro. + (gl_FUNC_MEMCMP): Inline it here. Set gl_cv_func_memcmp_working. Move + AC_LIBOBJ and gl_PREREQ_MEMCMP invocations from here... + * modules/memcmp (configure.ac): ... to here. + (Depends-on): Update conditions. + +2011-05-21 Bruno Haible <bruno@clisp.org> + memchr: Respect rules for use of AC_LIBOBJ. * m4/memchr.m4 (gl_FUNC_MEMCHR): Move AC_LIBOBJ and gl_PREREQ_MEMCHR invocations from here... diff --git a/m4/memcmp.m4 b/m4/memcmp.m4 index db1146b1ab..6c87525b04 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -1,4 +1,4 @@ -# memcmp.m4 serial 15 +# memcmp.m4 serial 16 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, @@ -7,30 +7,20 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MEMCMP], [ if test $cross_compiling != no; then - # AC_FUNC_MEMCMP as of 2.62 defaults to 'no' when cross compiling. + # The test below defaults to 'no' when cross compiling. # We default to yes if memcmp appears to exist, which works # better for MinGW. AC_CACHE_CHECK([whether cross-compiling target has memcmp], - [ac_cv_func_memcmp_working], + [gl_cv_func_memcmp_working], [AC_LINK_IFELSE([ AC_LANG_PROGRAM([[#include <string.h> ]], [[int ret = memcmp ("foo", "bar", 0);]])], - [ac_cv_func_memcmp_working=yes], - [ac_cv_func_memcmp_working=no])]) + [gl_cv_func_memcmp_working=yes], + [gl_cv_func_memcmp_working=no])]) fi - AC_FUNC_MEMCMP - dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ([memcmp]). - if test $ac_cv_func_memcmp_working = no; then - AC_DEFINE([memcmp], [rpl_memcmp], - [Define to rpl_memcmp if the replacement function should be used.]) - gl_PREREQ_MEMCMP - fi -]) - -# Redefine AC_FUNC_MEMCMP, because it is no longer maintained in Autoconf. -AC_DEFUN([AC_FUNC_MEMCMP], -[ - AC_CACHE_CHECK([for working memcmp], [ac_cv_func_memcmp_working], + dnl We don't use AC_FUNC_MEMCMP any more, because it is no longer maintained + dnl in Autoconf and because it invokes AC_LIBOBJ. + AC_CACHE_CHECK([for working memcmp], [gl_cv_func_memcmp_working], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT], @@ -57,11 +47,13 @@ AC_DEFUN([AC_FUNC_MEMCMP], return 0; } ]])], - [ac_cv_func_memcmp_working=yes], - [ac_cv_func_memcmp_working=no], - [ac_cv_func_memcmp_working=no])]) - test $ac_cv_func_memcmp_working = no && - AC_LIBOBJ([memcmp]) + [gl_cv_func_memcmp_working=yes], + [gl_cv_func_memcmp_working=no], + [gl_cv_func_memcmp_working=no])]) + if test $gl_cv_func_memcmp_working = no; then + AC_DEFINE([memcmp], [rpl_memcmp], + [Define to rpl_memcmp if the replacement function should be used.]) + fi ]) # Prerequisites of lib/memcmp.c. diff --git a/modules/memcmp b/modules/memcmp index dda4324882..5f31bbe06f 100644 --- a/modules/memcmp +++ b/modules/memcmp @@ -12,10 +12,14 @@ lib/memcmp.c m4/memcmp.m4 Depends-on: -stdint [test $ac_cv_func_memcmp_working = no] +stdint [test $gl_cv_func_memcmp_working = no] configure.ac: gl_FUNC_MEMCMP +if test $gl_cv_func_memcmp_working = no; then + AC_LIBOBJ([memcmp]) + gl_PREREQ_MEMCMP +fi Makefile.am: |