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.

diff --git a/ChangeLog b/ChangeLog
index 5ab0c71e264649186712adee7972db018335167d..7e94d6366d1b736a6d1592f4dbfe99c07926fe50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        strtoul: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index fd0a13db1bb52a6457a37d0744fadbf58acfe16e..ed6a854b58c5c07ce7c3b69e553c1409fa51246f 100644 (file)
--- 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 8295e83c2af823b7ae8a99f34092326bbd1360b4..5501fdac3b4d85e8c277f988bb7de19f58984e22 100644 (file)
--- 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: