From 35794abd2344f76934c814d9ec062340bfe5ae4a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 14:11:24 +0200 Subject: [PATCH] strtoll: Move AC_LIBOBJ invocations to module description. * m4/strtoll.m4 (gl_FUNC_STRTOLL): Call AC_CHECK_FUNCS instead of AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOLL invocations from here... * modules/strtoll (configure.ac): ... to here. --- ChangeLog | 8 ++++++++ m4/strtoll.m4 | 5 ++--- modules/strtoll | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ab0c71e26..7e94d6366d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-22 Bruno Haible + + strtoll: Move AC_LIBOBJ invocations to module description. + * m4/strtoll.m4 (gl_FUNC_STRTOLL): Call AC_CHECK_FUNCS instead of + AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOLL invocations from + here... + * modules/strtoll (configure.ac): ... to here. + 2011-05-22 Bruno Haible strtoul: Move AC_LIBOBJ invocations to module description. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index fd0a13db1b..ed6a854b58 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,4 +1,4 @@ -# strtoll.m4 serial 6 +# strtoll.m4 serial 7 dnl Copyright (C) 2002, 2004, 2006, 2008-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,10 +11,9 @@ AC_DEFUN([gl_FUNC_STRTOLL], dnl unless the type 'long long int' exists. AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) if test "$ac_cv_type_long_long_int" = yes; then - AC_REPLACE_FUNCS([strtoll]) + AC_CHECK_FUNCS([strtoll]) if test $ac_cv_func_strtoll = no; then HAVE_STRTOLL=0 - gl_PREREQ_STRTOLL fi fi ]) diff --git a/modules/strtoll b/modules/strtoll index 8295e83c2a..5501fdac3b 100644 --- a/modules/strtoll +++ b/modules/strtoll @@ -12,6 +12,10 @@ stdlib configure.ac: gl_FUNC_STRTOLL +if test $HAVE_STRTOLL = 0; then + AC_LIBOBJ([strtoll]) + gl_PREREQ_STRTOLL +fi gl_STDLIB_MODULE_INDICATOR([strtoll]) Makefile.am: -- 2.30.2