From ac1bd225590c8eb14160d1abf9b833746b4d8a73 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 02:03:08 +0200
Subject: [PATCH] isnanf*: Move AC_LIBOBJ invocations to module description.

* m4/isnanf.m4 (gl_FUNC_ISNANF, gl_FUNC_ISNANF_NO_LIBM): Move AC_LIBOBJ
invocation from here...
* modules/isnanf (configure.ac): ... to here.
* modules/isnanf-nolibm (configure.ac): ... and here.
---
 ChangeLog             | 8 ++++++++
 m4/isnanf.m4          | 8 +++-----
 modules/isnanf        | 4 ++++
 modules/isnanf-nolibm | 4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0918fafb2..a9e939114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-20  Bruno Haible  <bruno@clisp.org>
 
+	isnanf*: Move AC_LIBOBJ invocations to module description.
+	* m4/isnanf.m4 (gl_FUNC_ISNANF, gl_FUNC_ISNANF_NO_LIBM): Move AC_LIBOBJ
+	invocation from here...
+	* modules/isnanf (configure.ac): ... to here.
+	* modules/isnanf-nolibm (configure.ac): ... and here.
+
+2011-05-20  Bruno Haible  <bruno@clisp.org>
+
 	isnan*: Separate the AC_LIBOBJ invocations.
 	* m4/isnanf.m4 (gl_PREREQ_ISNANF): Renamed from gl_BUILD_ISNANF. Remove
 	AC_LIBOBJ invocation.
diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index 63a090bbc..66ed954be 100644
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -1,4 +1,4 @@
-# isnanf.m4 serial 13
+# isnanf.m4 serial 14
 dnl Copyright (C) 2007-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,
@@ -33,8 +33,6 @@ AC_DEFUN([gl_FUNC_ISNANF],
   fi
   if test $gl_func_isnanf != yes; then
     HAVE_ISNANF=0
-    AC_LIBOBJ([isnanf])
-    gl_PREREQ_ISNANF
   fi
   AC_SUBST([ISNANF_LIBM])
 ])
@@ -53,11 +51,11 @@ AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM],
             *) false;;
           esac
         }; then
+    gl_func_isnanf_no_libm=yes
     AC_DEFINE([HAVE_ISNANF_IN_LIBC], [1],
       [Define if the isnan(float) function is available in libc.])
   else
-    AC_LIBOBJ([isnanf])
-    gl_PREREQ_ISNANF
+    gl_func_isnanf_no_libm=no
   fi
 ])
 
diff --git a/modules/isnanf b/modules/isnanf
index 6ac3968fd..a04a8b364 100644
--- a/modules/isnanf
+++ b/modules/isnanf
@@ -15,6 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANF
+if test $HAVE_ISNANF = 0; then
+  AC_LIBOBJ([isnanf])
+  gl_PREREQ_ISNANF
+fi
 gl_MATH_MODULE_INDICATOR([isnanf])
 
 Makefile.am:
diff --git a/modules/isnanf-nolibm b/modules/isnanf-nolibm
index c178cc571..dba0878d7 100644
--- a/modules/isnanf-nolibm
+++ b/modules/isnanf-nolibm
@@ -15,6 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANF_NO_LIBM
+if test $gl_func_isnanf_no_libm != yes; then
+  AC_LIBOBJ([isnanf])
+  gl_PREREQ_ISNANF
+fi
 
 Makefile.am:
 
-- 
2.11.0