refresh 01-gnulib-directory.patch

[gnulib.git] / m4 / roundl.m4

diff --git a/m4/roundl.m4 b/m4/roundl.m4
index 1d25585..fcabe9e 100644 (file)
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -1,4 +1,4 @@
-# roundl.m4 serial 8
+# roundl.m4 serial 13
 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,
@@ -8,9 +8,12 @@ AC_DEFUN([gl_FUNC_ROUNDL],
 [
   m4_divert_text([DEFAULTS], [gl_roundl_required=plain])
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   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 +34,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,31 +63,36 @@ 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>])
-    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=
-        dnl Append $FLOORL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
-        case " $ROUNDL_LIBM " in
-          *" $FLOORL_LIBM "*) ;;
-          *) ROUNDL_LIBM="$ROUNDL_LIBM $FLOORL_LIBM" ;;
-        esac
-        dnl Append $CEILL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
-        case " $ROUNDL_LIBM " in
-          *" $CEILL_LIBM "*) ;;
-          *) ROUNDL_LIBM="$ROUNDL_LIBM $CEILL_LIBM" ;;
-        esac
+    dnl Find libraries needed to link lib/roundl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_ROUND])
+      ROUNDL_LIBM="$ROUND_LIBM"
+    else
+      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
+        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=
+          dnl Append $FLOORL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
+          case " $ROUNDL_LIBM " in
+            *" $FLOORL_LIBM "*) ;;
+            *) ROUNDL_LIBM="$ROUNDL_LIBM $FLOORL_LIBM" ;;
+          esac
+          dnl Append $CEILL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
+          case " $ROUNDL_LIBM " in
+            *" $CEILL_LIBM "*) ;;
+            *) ROUNDL_LIBM="$ROUNDL_LIBM $CEILL_LIBM" ;;
+          esac
+        else
+          ROUNDL_LIBM=
+        fi
       else
         ROUNDL_LIBM=
       fi
-    else
-      ROUNDL_LIBM=
     fi
   fi
   AC_SUBST([ROUNDL_LIBM])