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.

diff --git a/ChangeLog b/ChangeLog
index 3cbbbc50254772c30a8d95b6c5866190d7853fe3..56de524e7ac242992393a527267799c5d21cc65e 100644 (file)
--- 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 0c5e78328e6ed46739938270dcd39e65c3e261ec..a99cbb3b9a7708fed87089e3fbc08d495e52f917 100644 (file)
--- 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 362b1f8226fb423abbb794abf1b21702749b40cf..1ac796d52c9f1bb721993b91f654fa04e7282d43 100644 (file)
--- 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 a04a8b364a008eedb33ee05e407c9e59cb1f8d36..8b9e3a138824ab7817a4fe8981a43d9926a36092 100644 (file)
--- 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 01b4417f266072501a61bbd6da03d51084c75c0a..c44b2c9a711f46a00bf51616c6f81be6a001f155 100644 (file)
--- 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