X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Froundl.m4;h=427c199372b13c55c7bbbc98f40b9f41e0bb96c2;hb=7c3e409e535bb5da1cdb1a5664d0b7c4fddffd61;hp=25ee1f8f833a5f96fb2d041dc68fd7f476f2602b;hpb=7094a1e0d56aa303077cc0bccaa559a28e613ade;p=gnulib.git

diff --git a/m4/roundl.m4 b/m4/roundl.m4
index 25ee1f8f8..427c19937 100644
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -1,5 +1,5 @@
-# roundl.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# roundl.m4 serial 5
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,17 +12,25 @@ AC_DEFUN([gl_FUNC_ROUNDL],
   AC_CHECK_DECLS([roundl], , , [#include <math.h>])
   if test "$ac_cv_have_decl_roundl" = yes; then
     gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = roundl (x);])
-  else
+  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])
 ])