X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Froundf.m4;h=650311e3cc333c1b055361176d9d9a8fc462d161;hb=6b61508657346fdef38811f73bc1643879752862;hp=da3151caa2646dd6861d2e0d0d73acb838ed764a;hpb=ca45caaa07c9e69f791a8e93199aeafa181e7572;p=gnulib.git

diff --git a/m4/roundf.m4 b/m4/roundf.m4
index da3151caa..650311e3c 100644
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -1,4 +1,4 @@
-# roundf.m4 serial 3
+# roundf.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_ROUNDF],
     gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);])
   fi
   if test "$ac_cv_have_decl_roundf" != yes || test "$ROUNDF_LIBM" = missing; then
+    REPLACE_ROUNDF=1
+    AC_LIBOBJ([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 "$ac_cv_have_decl_floorf" = yes \
+       && test "$ac_cv_have_decl_ceilf" = yes; 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
     else
       ROUNDF_LIBM=
     fi
-    HAVE_DECL_ROUNDF=0
-    AC_LIBOBJ([roundf])
   fi
-  AC_SUBST([HAVE_DECL_ROUNDF])
   AC_SUBST([ROUNDF_LIBM])
 ])