maint.mk: relax the default _gl_TS_function_match regexp

[gnulib.git] / m4 / round.m4

diff --git a/m4/round.m4 b/m4/round.m4
index e11f518..9f6691f 100644 (file)
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -1,11 +1,12 @@
-# round.m4 serial 8
-dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+# round.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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_ROUND],
 [
+  m4_divert_text([DEFAULTS], [gl_round_required=plain])
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   dnl Persuade glibc <math.h> to declare round().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -40,8 +41,8 @@ int main()
   exit (x < 0.5 && round (x) != 0.0);
 }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
           [case "$host_os" in
-             netbsd*) gl_cv_func_round_works="guessing no";;
-             *)       gl_cv_func_round_works="guessing yes";;
+             netbsd* | aix*) gl_cv_func_round_works="guessing no";;
+             *)              gl_cv_func_round_works="guessing yes";;
            esac
           ])
           LIBS="$save_LIBS"
@@ -53,11 +54,47 @@ int main()
     if test "$ROUND_LIBM" = missing; then
       REPLACE_ROUND=1
     fi
+    m4_ifdef([gl_FUNC_ROUND_IEEE], [
+      if test $gl_round_required = ieee && test $REPLACE_ROUND = 0; then
+        AC_CACHE_CHECK([whether round works according to ISO C 99 with IEC 60559],
+          [gl_cv_func_round_ieee],
+          [
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $ROUND_LIBM"
+            AC_RUN_IFELSE(
+              [AC_LANG_SOURCE([[
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES 1 /* for glibc */
+#endif
+#include <math.h>
+]gl_DOUBLE_MINUS_ZERO_CODE[
+]gl_DOUBLE_SIGNBIT_CODE[
+static double dummy (double f) { return 0; }
+int main (int argc, char *argv[])
+{
+  double (*my_round) (double) = argc ? round : dummy;
+  /* Test whether round (-0.0) is -0.0.  */
+  if (signbitd (minus_zerod) && !signbitd (my_round (minus_zerod)))
+    return 1;
+  return 0;
+}
+              ]])],
+              [gl_cv_func_round_ieee=yes],
+              [gl_cv_func_round_ieee=no],
+              [gl_cv_func_round_ieee="guessing no"])
+            LIBS="$save_LIBS"
+          ])
+        case "$gl_cv_func_round_ieee" in
+          *yes) ;;
+          *) REPLACE_ROUND=1 ;;
+        esac
+      fi
+    ])
   else
     HAVE_DECL_ROUND=0
   fi
   if test $HAVE_DECL_ROUND = 0 || test $REPLACE_ROUND = 1; then
-    AC_LIBOBJ([round])
+    dnl Find libraries needed to link lib/round.c.
     gl_FUNC_FLOOR_LIBS
     gl_FUNC_CEIL_LIBS
     ROUND_LIBM=