Mercurial > hg > octave-lojdl > gnulib-hg

changeset 9467:08b76f84ac5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the shared tests for the floor* and ceil* functions.
author Bruno Haible <bruno@clisp.org>
date Sun, 11 Nov 2007 14:17:22 +0100
parents 1013cba29012
children 6eda531c067c
files ChangeLog m4/round.m4 m4/roundf.m4 m4/roundl.m4 modules/round modules/roundf modules/roundl
diffstat 7 files changed, 29 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
+	* m4/roundf.m4 (gl_FUNC_ROUNDF): Use gl_FUNC_FLOORF_LIBS and
+	gl_FUNC_CEILF_LIBS.
+	* m4/round.m4 (gl_FUNC_ROUND): Use gl_FUNC_FLOOR_LIBS and
+	gl_FUNC_CEIL_LIBS.
+	* m4/roundl.m4 (gl_FUNC_ROUNDL): Use gl_FUNC_FLOORL_LIBS and
+	gl_FUNC_CEILL_LIBS.
+	* modules/roundf (Files): Add m4/floorf.m4, m4/ceilf.m4.
+	* modules/round (Files): Add m4/floor.m4, m4/ceil.m4.
+	* modules/roundl (Files): Add m4/floorl.m4, m4/ceill.m4.
+
 2007-11-11  Bruno Haible  <bruno@clisp.org>
 
 	* m4/roundf.m4 (gl_FUNC_ROUNDF): Handle the case that floorf and
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -16,6 +16,8 @@
   if test "$ac_cv_have_decl_round" != yes || test "$ROUND_LIBM" = missing; then
     REPLACE_ROUND=1
     AC_LIBOBJ([round])
-    gl_CHECK_MATH_LIB([ROUND_LIBM], [x = floor (x) + ceil (x);])
+    gl_FUNC_FLOOR_LIBS
+    gl_FUNC_CEIL_LIBS
+    ROUND_LIBM="$FLOOR_LIBM $CEIL_LIBM"
   fi
   AC_SUBST([ROUND_LIBM])])
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -19,10 +19,12 @@
     AC_CHECK_DECLS([ceilf, floorf], , , [#include <math.h>])
     if test "$ac_cv_have_decl_floorf" = yes \
        && test "$ac_cv_have_decl_ceilf" = yes; then
-      gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = floorf (x) + ceilf (x);])
-      if test "$ROUNDF_LIBM" != missing; then
+      gl_FUNC_FLOORF_LIBS
+      gl_FUNC_CEILF_LIBS
+      if test "$FLOORF_LIBM" != '?' && test "$CEILF_LIBM" != '?'; then
         AC_DEFINE([HAVE_FLOORF_AND_CEILF], 1,
           [Define if the both the floorf() and ceilf() functions exist.])
+        ROUNDF_LIBM="$FLOORF_LIBM $CEILF_LIBM"
       else
         ROUNDF_LIBM=
       fi
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -19,10 +19,12 @@
     AC_CHECK_DECLS([ceill, floorl], , , [#include <math.h>])
     if test "$ac_cv_have_decl_floorl" = yes \
        && test "$ac_cv_have_decl_ceill" = yes; then
-      gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = floorl (x) + ceill (x);])
-      if test "$ROUNDL_LIBM" != missing; then
+      gl_FUNC_FLOORL_LIBS
+      gl_FUNC_CEILL_LIBS
+      if test "$FLOORL_LIBM" != '?' && test "$CEILL_LIBM" != '?'; then
         AC_DEFINE([HAVE_FLOORL_AND_CEILL], 1,
           [Define if the both the floorl() and ceill() functions exist.])
+        ROUNDL_LIBM="$FLOORL_LIBM $CEILL_LIBM"
       else
         ROUNDL_LIBM=
       fi
--- a/modules/round
+++ b/modules/round
@@ -5,6 +5,8 @@
 lib/round.c
 m4/check-math-lib.m4
 m4/round.m4
+m4/floor.m4
+m4/ceil.m4
 
 Depends-on:
 float
--- a/modules/roundf
+++ b/modules/roundf
@@ -6,6 +6,8 @@
 lib/roundf.c
 m4/check-math-lib.m4
 m4/roundf.m4
+m4/floorf.m4
+m4/ceilf.m4
 
 Depends-on:
 float
--- a/modules/roundl
+++ b/modules/roundl
@@ -6,6 +6,8 @@
 lib/roundl.c
 m4/check-math-lib.m4
 m4/roundl.m4
+m4/floorl.m4
+m4/ceill.m4
 
 Depends-on:
 float