From d883d21093429a7826bf42556d4db32dd2d3975c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 14:05:58 +0200
Subject: [PATCH] strtol: Move AC_LIBOBJ invocations to module description.

* m4/strtol.m4 (gl_FUNC_STRTOL): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ invocation from here...
* modules/strtol (configure.ac): ... to here.
---
 ChangeLog      | 7 +++++++
 m4/strtol.m4   | 4 ++--
 modules/strtol | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f7f0975dc..0b67636e34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strtol: Move AC_LIBOBJ invocations to module description.
+	* m4/strtol.m4 (gl_FUNC_STRTOL): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ invocation from here...
+	* modules/strtol (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strtod: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/strtol.m4 b/m4/strtol.m4
index 10f0284bec..bd47d3e5cf 100644
--- a/m4/strtol.m4
+++ b/m4/strtol.m4
@@ -1,4 +1,4 @@
-# strtol.m4 serial 5
+# strtol.m4 serial 6
 dnl Copyright (C) 2002-2003, 2006, 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,5 +6,5 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOL],
 [
-  AC_REPLACE_FUNCS([strtol])
+  AC_CHECK_FUNCS([strtol])
 ])
diff --git a/modules/strtol b/modules/strtol
index 654b2f77f3..65b6946390 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -15,6 +15,9 @@ Depends-on:
 
 configure.ac:
 gl_FUNC_STRTOL
+if test $ac_cv_func_strtol = no; then
+  AC_LIBOBJ([strtol])
+fi
 
 Makefile.am:
 
-- 
2.30.2