Mercurial > hg > octave-kai > gnulib-hg

changeset 14993:0b565f0b19ad

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