X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Froundl.m4;h=eece9d7cb302ae4cdbfb4a602fedb80e3858f9b5;hb=a365e1e5d3afa9a9f12d38eacaade8cd8fe0020e;hp=1d2558510c306d917cff4d581aafaa7066856409;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/m4/roundl.m4 b/m4/roundl.m4
index 1d2558510..eece9d7cb 100644
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -1,4 +1,4 @@
-# roundl.m4 serial 8
+# roundl.m4 serial 12
 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_ROUNDL],
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   dnl Persuade glibc <math.h> to declare roundl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_DECLS([roundl], , , [#include <math.h>])
+  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);])
     if test "$ROUNDL_LIBM" = missing; then
@@ -31,12 +31,18 @@ AC_DEFUN([gl_FUNC_ROUNDL],
 #include <math.h>
 ]gl_LONG_DOUBLE_MINUS_ZERO_CODE[
 ]gl_LONG_DOUBLE_SIGNBIT_CODE[
-int main()
+static long double dummy (long double f) { return 0; }
+int main (int argc, char *argv[])
 {
+  long double (*my_roundl) (long double) = argc ? roundl : dummy;
+  int result = 0;
   /* Test whether roundl (-0.0L) is -0.0L.  */
-  if (signbitl (minus_zerol) && !signbitl (roundl (minus_zerol)))
-    return 1;
-  return 0;
+  if (signbitl (minus_zerol) && !signbitl (my_roundl (minus_zerol)))
+    result |= 1;
+  /* Test whether roundl (-0.3L) is -0.0L.  */
+  if (signbitl (-0.3L) && !signbitl (my_roundl (-0.3L)))
+    result |= 2;
+  return result;
 }
               ]])],
               [gl_cv_func_roundl_ieee=yes],
@@ -54,8 +60,8 @@ int main()
     HAVE_DECL_ROUNDL=0
   fi
   if test $HAVE_DECL_ROUNDL = 0 || test $REPLACE_ROUNDL = 1; then
-    AC_LIBOBJ([roundl])
-    AC_CHECK_DECLS([ceill, floorl], , , [#include <math.h>])
+    dnl Find libraries needed to link lib/roundl.c.
+    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_FUNC_FLOORL_LIBS