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.

diff --git a/ChangeLog b/ChangeLog
index 0918fafb25306a32439dc369856d103fa8c6e046..a9e939114bcf1f6f99381ddbff61772dd534ab76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index 63a090bbcec74e9bb5dade669012dc40ae84e543..66ed954bed76a9a54e505e92578d718dfbd41424 100644 (file)
--- 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 6ac3968fd1e147601544c38dd7277bd39fc4c3bf..a04a8b364a008eedb33ee05e407c9e59cb1f8d36 100644 (file)
--- 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 c178cc5711cbc41e551832fc8daf4f62dfb9df38..dba0878d735df3ca8dbefd188ba4fb3d8b41bfaf 100644 (file)
--- 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: