Mercurial > hg > octave-shane > gnulib-hg

changeset 14994:82b6f0e30fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 02:08:40 +0200
parents 0b565f0b19ad
children 4e1b0338ea60
files ChangeLog m4/isnand.m4 modules/isnand modules/isnand-nolibm
diffstat 4 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
--- 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 @@
   else
     gl_func_isnand=no
     HAVE_ISNAND=0
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
   fi
   AC_SUBST([ISNAND_LIBM])
 ])
@@ -35,12 +33,10 @@
 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
 ])
 
--- a/modules/isnand
+++ b/modules/isnand
@@ -15,6 +15,10 @@
 
 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:
--- a/modules/isnand-nolibm
+++ b/modules/isnand-nolibm
@@ -15,6 +15,10 @@
 
 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: