X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Froundl.m4;h=de9f63a0f0d3cdfda54321f8a3d86b8886e074ea;hb=01dfd1752e938c6fca54e791eb2adc1de29189f5;hp=828103cd462f66e4701dfc81733ffbca83dd33cd;hpb=ca45caaa07c9e69f791a8e93199aeafa181e7572;p=gnulib.git

diff --git a/m4/roundl.m4 b/m4/roundl.m4
index 828103cd4..de9f63a0f 100644
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -1,4 +1,4 @@
-# roundl.m4 serial 3
+# roundl.m4 serial 4
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,16 +14,23 @@ AC_DEFUN([gl_FUNC_ROUNDL],
     gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = roundl (x);])
   fi
   if test "$ac_cv_have_decl_roundl" != yes || test "$ROUNDL_LIBM" = missing; then
+    REPLACE_ROUNDL=1
+    AC_LIBOBJ([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 "$ac_cv_have_decl_floorl" = yes \
+       && test "$ac_cv_have_decl_ceill" = yes; 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
     else
       ROUNDL_LIBM=
     fi
-    HAVE_DECL_ROUNDL=0
-    AC_LIBOBJ([roundl])
   fi
-  AC_SUBST([HAVE_DECL_ROUNDL])
   AC_SUBST([ROUNDL_LIBM])
 ])