From ba07288e32b07a98c79f8812eed7e03daa5b7f26 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 02:21:30 +0200
Subject: [PATCH] isnan: Respect rules for use of AC_LIBOBJ.

* m4/isnan.m4 (gl_ISNAN): Don't do the AC_LIBOBJ and gl_PREREQ_ISNAN*
invocations here.
* modules/isnanf (configure.ac): Require gl_ISNAN if it exists. Test
REPLACE_ISNAN.
* modules/isnand (configure.ac): Likewise.
* modules/isnanl (configure.ac): Likewise.
---
 ChangeLog      | 10 ++++++++++
 m4/isnan.m4    | 10 ++--------
 modules/isnand |  5 ++++-
 modules/isnanf |  5 ++++-
 modules/isnanl |  5 ++++-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cbbbc5025..56de524e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-20  Bruno Haible  <bruno@clisp.org>
+
+	isnan: Respect rules for use of AC_LIBOBJ.
+	* m4/isnan.m4 (gl_ISNAN): Don't do the AC_LIBOBJ and gl_PREREQ_ISNAN*
+	invocations here.
+	* modules/isnanf (configure.ac): Require gl_ISNAN if it exists. Test
+	REPLACE_ISNAN.
+	* modules/isnand (configure.ac): Likewise.
+	* modules/isnanl (configure.ac): Likewise.
+
 2011-05-20  Bruno Haible  <bruno@clisp.org>
 
 	isnanl*: Respect rules for use of AC_LIBOBJ.
diff --git a/m4/isnan.m4 b/m4/isnan.m4
index 0c5e78328e..a99cbb3b9a 100644
--- a/m4/isnan.m4
+++ b/m4/isnan.m4
@@ -1,4 +1,4 @@
-# isnan.m4 serial 4
+# isnan.m4 serial 5
 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,
@@ -36,14 +36,8 @@ AC_DEFUN([gl_ISNAN],
     esac
   else
     AC_MSG_RESULT([no])
+    dnl REPLACE_ISNAN=1 also makes sure the rpl_isnan[fdl] functions get built.
     REPLACE_ISNAN=1
-    # Make sure the rpl_isnan[fdl] functions get built.
-    AC_LIBOBJ([isnanf])
-    gl_PREREQ_ISNANF
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
-    AC_LIBOBJ([isnanl])
-    gl_PREREQ_ISNANL
     ISNAN_LIBM=
   fi
   AC_SUBST([ISNAN_LIBM])
diff --git a/modules/isnand b/modules/isnand
index 362b1f8226..1ac796d52c 100644
--- a/modules/isnand
+++ b/modules/isnand
@@ -15,7 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNAND
-if test $HAVE_ISNAND = 0; then
+m4_ifdef([gl_ISNAN], [
+  AC_REQUIRE([gl_ISNAN])
+])
+if test $HAVE_ISNAND = 0 || test $REPLACE_ISNAN = 1; then
   AC_LIBOBJ([isnand])
   gl_PREREQ_ISNAND
 fi
diff --git a/modules/isnanf b/modules/isnanf
index a04a8b364a..8b9e3a1388 100644
--- a/modules/isnanf
+++ b/modules/isnanf
@@ -15,7 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANF
-if test $HAVE_ISNANF = 0; then
+m4_ifdef([gl_ISNAN], [
+  AC_REQUIRE([gl_ISNAN])
+])
+if test $HAVE_ISNANF = 0 || test $REPLACE_ISNAN = 1; then
   AC_LIBOBJ([isnanf])
   gl_PREREQ_ISNANF
 fi
diff --git a/modules/isnanl b/modules/isnanl
index 01b4417f26..c44b2c9a71 100644
--- a/modules/isnanl
+++ b/modules/isnanl
@@ -16,7 +16,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANL
-if test $HAVE_ISNANL = 0; then
+m4_ifdef([gl_ISNAN], [
+  AC_REQUIRE([gl_ISNAN])
+])
+if test $HAVE_ISNANL = 0 || test $REPLACE_ISNAN = 1; then
   AC_LIBOBJ([isnanl])
   gl_PREREQ_ISNANL
 fi
-- 
2.30.2