From 2956c60417eacf0e20506e0a378b831427151ea7 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 14:16:25 +0200
Subject: [PATCH] strtoimax: Move AC_LIBOBJ invocations to module description.

* m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOIMAX invocations
from here...
* modules/strtoimax (configure.ac): ... to here.
---
 ChangeLog         | 8 ++++++++
 m4/strtoimax.m4   | 7 ++-----
 modules/strtoimax | 4 ++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f8fcbd70..56bf22a3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+	strtoimax: Move AC_LIBOBJ invocations to module description.
+	* m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOIMAX invocations
+	from here...
+	* modules/strtoimax (configure.ac): ... to here.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
 	strtoull: Move AC_LIBOBJ invocations to module description.
 	* m4/strtoull.m4 (gl_FUNC_STRTOULL): Call AC_CHECK_FUNCS instead of
 	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRTOULL invocations
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index d46673b2a..47fb1bc9c 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 9
+# strtoimax.m4 serial 10
 dnl Copyright (C) 2002-2004, 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,
@@ -12,10 +12,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
   if test "$ac_cv_have_decl_strtoimax" != yes; then
     HAVE_DECL_STRTOIMAX=0
 
-    AC_REPLACE_FUNCS([strtoimax])
-    if test $ac_cv_func_strtoimax = no; then
-      gl_PREREQ_STRTOIMAX
-    fi
+    AC_CHECK_FUNCS([strtoimax])
   fi
 ])
 
diff --git a/modules/strtoimax b/modules/strtoimax
index 5c8d5e379..567ce78c9 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -14,6 +14,10 @@ strtoll         [test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_st
 
 configure.ac:
 gl_FUNC_STRTOIMAX
+if test "$ac_cv_have_decl_strtoimax" != yes && test $ac_cv_func_strtoimax = no; then
+  AC_LIBOBJ([strtoimax])
+  gl_PREREQ_STRTOIMAX
+fi
 gl_INTTYPES_MODULE_INDICATOR([strtoimax])
 
 Makefile.am:
-- 
2.11.0