Mercurial > hg > octave-nkf > gnulib-hg

changeset 14995:4e1b0338ea60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 02:15:03 +0200
parents 82b6f0e30fae
children 369a2b1bfba1
files ChangeLog m4/isnanl.m4 modules/isnanl modules/isnanl-nolibm
diffstat 4 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
   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 @@
   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
 ])
 
--- a/modules/isnanl
+++ b/modules/isnanl
@@ -16,6 +16,10 @@
 
 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:
--- a/modules/isnanl-nolibm
+++ b/modules/isnanl-nolibm
@@ -16,6 +16,10 @@
 
 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: