isnanl*: Respect rules for use of AC_LIBOBJ.

* m4/isnanl.m4 (gl_FUNC_ISNANL, gl_FUNC_ISNANL_NO_LIBM): Move AC_LIBOBJ
invocation from here...
* modules/isnanl (configure.ac): ... to here.
* modules/isnanl-nolibm (configure.ac): ... and here.

diff --git a/ChangeLog b/ChangeLog
index fdbc3e0160b5aa80ea50879700ea18254b83c0c9..3cbbbc50254772c30a8d95b6c5866190d7853fe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-20  Bruno Haible  <bruno@clisp.org>
+
+       isnanl*: Respect rules for use of AC_LIBOBJ.
+       * m4/isnanl.m4 (gl_FUNC_ISNANL, gl_FUNC_ISNANL_NO_LIBM): Move AC_LIBOBJ
+       invocation from here...
+       * modules/isnanl (configure.ac): ... to here.
+       * modules/isnanl-nolibm (configure.ac): ... and here.
+
 2011-05-20  Bruno Haible  <bruno@clisp.org>
 
        isnand*: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index e6b10c3ebd2da8750e3d76db35d58cb39e518345..c79308b03538a6409c3105d1077564d0076ec492 100644 (file)
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -1,4 +1,4 @@
-# isnanl.m4 serial 15
+# isnanl.m4 serial 16
 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,
@@ -31,8 +31,6 @@ AC_DEFUN([gl_FUNC_ISNANL],
   fi
   if test $gl_func_isnanl != yes; then
     HAVE_ISNANL=0
-    AC_LIBOBJ([isnanl])
-    gl_PREREQ_ISNANL
   fi
   AC_SUBST([ISNANL_LIBM])
 ])
@@ -51,9 +49,6 @@ AC_DEFUN([gl_FUNC_ISNANL_NO_LIBM],
   if test $gl_func_isnanl_no_libm = yes; then
     AC_DEFINE([HAVE_ISNANL_IN_LIBC], [1],
       [Define if the isnan(long double) function is available in libc.])
-  else
-    AC_LIBOBJ([isnanl])
-    gl_PREREQ_ISNANL
   fi
 ])
 

diff --git a/modules/isnanl b/modules/isnanl
index 8bad6f672abf1311883bac4017b12496852ab175..01b4417f266072501a61bbd6da03d51084c75c0a 100644 (file)
--- a/modules/isnanl
+++ b/modules/isnanl
@@ -16,6 +16,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANL
+if test $HAVE_ISNANL = 0; then
+  AC_LIBOBJ([isnanl])
+  gl_PREREQ_ISNANL
+fi
 gl_MATH_MODULE_INDICATOR([isnanl])
 
 Makefile.am:

diff --git a/modules/isnanl-nolibm b/modules/isnanl-nolibm
index 85823c91289d5440c290da3b77450a5e70aea476..5a98e4904aa205add4ad33d200913ded23a3654c 100644 (file)
--- a/modules/isnanl-nolibm
+++ b/modules/isnanl-nolibm
@@ -16,6 +16,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNANL_NO_LIBM
+if test $gl_func_isnanl_no_libm != yes; then
+  AC_LIBOBJ([isnanl])
+  gl_PREREQ_ISNANL
+fi
 
 Makefile.am: