From 4f5d6e3303187de7b1c3e41609f798de1f47f219 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Fri, 6 May 2011 01:06:05 +0200
Subject: [PATCH 3/8] atoll: Move AC_LIBOBJ invocations to module description.

* m4/atoll.m4 (gl_FUNC_ATOLL): Move AC_LIBOBJ and gl_PREREQ_ATOLL
invocations from here...
* modules/atoll (configure.ac): ... to here.
---
 ChangeLog     |    5 +++++
 m4/atoll.m4   |    4 +---
 modules/atoll |    4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44da525..5b69d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-05  Bruno Haible  <address@hidden>
 
+	atoll: Move AC_LIBOBJ invocations to module description.
+	* m4/atoll.m4 (gl_FUNC_ATOLL): Move AC_LIBOBJ and gl_PREREQ_ATOLL
+	invocations from here...
+	* modules/atoll (configure.ac): ... to here.
+
 	argz: Move AC_LIBOBJ invocations to module description.
 	* m4/argz.m4 (gl_FUNC_ARGZ): Move AC_LIBOBJ invocation from here...
 	* modules/argz (configure.ac): ... to here.
diff --git a/m4/atoll.m4 b/m4/atoll.m4
index f504542..6cb4dd1 100644
--- a/m4/atoll.m4
+++ b/m4/atoll.m4
@@ -1,4 +1,4 @@
-# atoll.m4 serial 1
+# atoll.m4 serial 2
 dnl Copyright (C) 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,
@@ -14,8 +14,6 @@ AC_DEFUN([gl_FUNC_ATOLL],
     AC_CHECK_FUNCS([atoll])
     if test $ac_cv_func_atoll = no; then
       HAVE_ATOLL=0
-      AC_LIBOBJ([atoll])
-      gl_PREREQ_ATOLL
     fi
   fi
 ])
diff --git a/modules/atoll b/modules/atoll
index d979a00..d1a5364 100644
--- a/modules/atoll
+++ b/modules/atoll
@@ -11,6 +11,10 @@ strtoll         [test $HAVE_ATOLL = 0]
 
 configure.ac:
 gl_FUNC_ATOLL
+if test $HAVE_ATOLL = 0; then
+  AC_LIBOBJ([atoll])
+  gl_PREREQ_ATOLL
+fi
 gl_STDLIB_MODULE_INDICATOR([atoll])
 
 Makefile.am:
-- 
1.6.3.2