From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 00:08:40 +0000 (+0200)
Subject: isnand*: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2532
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=308cae2a36b73ea570af86e904528776a47b6e16;p=gnulib.git

isnand*: Move AC_LIBOBJ invocations to module description.

* m4/isnand.m4 (gl_FUNC_ISNAND, gl_FUNC_ISNAND_NO_LIBM): Move AC_LIBOBJ
invocation from here...
* modules/isnand (configure.ac): ... to here.
* modules/isnand-nolibm (configure.ac): ... and here.
---

diff --git a/ChangeLog b/ChangeLog
index a9e939114..fdbc3e016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-20  Bruno Haible  <bruno@clisp.org>
 
+	isnand*: Move AC_LIBOBJ invocations to module description.
+	* m4/isnand.m4 (gl_FUNC_ISNAND, gl_FUNC_ISNAND_NO_LIBM): Move AC_LIBOBJ
+	invocation from here...
+	* modules/isnand (configure.ac): ... to here.
+	* modules/isnand-nolibm (configure.ac): ... and here.
+
+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...
diff --git a/m4/isnand.m4 b/m4/isnand.m4
index b000ab526..2b18b0ac6 100644
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,4 +1,4 @@
-# isnand.m4 serial 9
+# isnand.m4 serial 10
 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,
@@ -24,8 +24,6 @@ AC_DEFUN([gl_FUNC_ISNAND],
   else
     gl_func_isnand=no
     HAVE_ISNAND=0
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
   fi
   AC_SUBST([ISNAND_LIBM])
 ])
@@ -35,12 +33,10 @@ dnl Check how to get or define isnand() without linking with libm.
 AC_DEFUN([gl_FUNC_ISNAND_NO_LIBM],
 [
   gl_HAVE_ISNAND_NO_LIBM
+  gl_func_isnand_no_libm=$gl_cv_func_isnand_no_libm
   if test $gl_cv_func_isnand_no_libm = yes; then
     AC_DEFINE([HAVE_ISNAND_IN_LIBC], [1],
       [Define if the isnan(double) function is available in libc.])
-  else
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
   fi
 ])
 
diff --git a/modules/isnand b/modules/isnand
index c741769d1..362b1f822 100644
--- a/modules/isnand
+++ b/modules/isnand
@@ -15,6 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNAND
+if test $HAVE_ISNAND = 0; then
+  AC_LIBOBJ([isnand])
+  gl_PREREQ_ISNAND
+fi
 gl_MATH_MODULE_INDICATOR([isnand])
 
 Makefile.am:
diff --git a/modules/isnand-nolibm b/modules/isnand-nolibm
index eceabf72f..dfd587390 100644
--- a/modules/isnand-nolibm
+++ b/modules/isnand-nolibm
@@ -15,6 +15,10 @@ memcmp
 
 configure.ac:
 gl_FUNC_ISNAND_NO_LIBM
+if test $gl_func_isnand_no_libm != yes; then
+  AC_LIBOBJ([isnand])
+  gl_PREREQ_ISNAND
+fi
 
 Makefile.am: