Use the shared tests for the floor* and ceil* functions.

diff --git a/ChangeLog b/ChangeLog
index 3bdb99e..ef5eb8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 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
        roundf were declared but do not exist on functions.
        * m4/roundl.m4 (gl_FUNC_ROUNDL): Handle the case that floorl and

diff --git a/m4/round.m4 b/m4/round.m4
index 4f197fb..44c05ca 100644 (file)
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -16,6 +16,8 @@ AC_DEFUN([gl_FUNC_ROUND],
   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])])

diff --git a/m4/roundf.m4 b/m4/roundf.m4
index 5878beb..650311e 100644 (file)
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -19,10 +19,12 @@ AC_DEFUN([gl_FUNC_ROUNDF],
     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

diff --git a/m4/roundl.m4 b/m4/roundl.m4
index a35943c..de9f63a 100644 (file)
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -19,10 +19,12 @@ AC_DEFUN([gl_FUNC_ROUNDL],
     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

diff --git a/modules/round b/modules/round
index 7d1110f..c4acba1 100644 (file)
--- a/modules/round
+++ b/modules/round
@@ -5,6 +5,8 @@ Files:
 lib/round.c
 m4/check-math-lib.m4
 m4/round.m4
+m4/floor.m4
+m4/ceil.m4
 
 Depends-on:
 float

diff --git a/modules/roundf b/modules/roundf
index d3098f7..d77b2a1 100644 (file)
--- a/modules/roundf
+++ b/modules/roundf
@@ -6,6 +6,8 @@ lib/round.c
 lib/roundf.c
 m4/check-math-lib.m4
 m4/roundf.m4
+m4/floorf.m4
+m4/ceilf.m4
 
 Depends-on:
 float

diff --git a/modules/roundl b/modules/roundl
index 1edce04..9eb9f1d 100644 (file)
--- a/modules/roundl
+++ b/modules/roundl
@@ -6,6 +6,8 @@ lib/round.c
 lib/roundl.c
 m4/check-math-lib.m4
 m4/roundl.m4
+m4/floorl.m4
+m4/ceill.m4
 
 Depends-on:
 float