X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fceill.m4;h=40adaf12f183859ed5f5deba467572103a4821ee;hb=60e3ab133c3ffe0bae411a44829498faf8816b34;hp=577bc55369c2aad65d46fc31e95b4c83ccb75674;hpb=1fd8064a06ed3ca83f73c495e998e66c225e395b;p=gnulib.git

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 577bc5536..40adaf12f 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,28 +1,68 @@
-# ceill.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# ceill.m4 serial 11
+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_CEILL],
 [
+  m4_divert_text([DEFAULTS], [gl_ceill_required=plain])
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   dnl Persuade glibc <math.h> to declare ceill().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   dnl Test whether ceill() is declared.
-  AC_CHECK_DECLS([ceill], , , [#include <math.h>])
+  AC_CHECK_DECLS([ceill], , , [[#include <math.h>]])
   if test "$ac_cv_have_decl_ceill" = yes; then
     dnl Test whether ceill() can be used without libm.
     gl_FUNC_CEILL_LIBS
     if test "$CEILL_LIBM" = "?"; then
-      CEILL_LIBM=
+      dnl Sun C 5.0 on Solaris declares ceill() and has it in the system-wide
+      dnl libm.so, but not in the libm.so that the compiler uses.
+      REPLACE_CEILL=1
     fi
+    m4_ifdef([gl_FUNC_CEILL_IEEE], [
+      if test $gl_ceill_required = ieee && test $REPLACE_CEILL = 0; then
+        AC_CACHE_CHECK([whether ceill works according to ISO C 99 with IEC 60559],
+          [gl_cv_func_ceill_ieee],
+          [
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $CEILL_LIBM"
+            AC_RUN_IFELSE(
+              [AC_LANG_SOURCE([[
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES 1 /* for glibc */
+#endif
+#include <math.h>
+]gl_LONG_DOUBLE_MINUS_ZERO_CODE[
+]gl_LONG_DOUBLE_SIGNBIT_CODE[
+static long double dummy (long double f) { return 0; }
+int main (int argc, char *argv[])
+{
+  long double (*my_ceill) (long double) = argc ? ceill : dummy;
+  /* Test whether ceill (-0.3L) is -0.0L.  */
+  if (signbitl (minus_zerol) && !signbitl (my_ceill (-0.3L)))
+    return 1;
+  return 0;
+}
+              ]])],
+              [gl_cv_func_ceill_ieee=yes],
+              [gl_cv_func_ceill_ieee=no],
+              [gl_cv_func_ceill_ieee="guessing no"])
+            LIBS="$save_LIBS"
+          ])
+        case "$gl_cv_func_ceill_ieee" in
+          *yes) ;;
+          *) REPLACE_CEILL=1 ;;
+        esac
+      fi
+    ])
   else
     HAVE_DECL_CEILL=0
-    AC_LIBOBJ([ceill])
+  fi
+  if test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1; then
+    dnl No libraries are needed to link lib/ceill.c.
     CEILL_LIBM=
   fi
-  AC_SUBST([HAVE_DECL_CEILL])
   AC_SUBST([CEILL_LIBM])
 ])
 
@@ -30,29 +70,31 @@ AC_DEFUN([gl_FUNC_CEILL],
 # Sets CEILL_LIBM.
 AC_DEFUN([gl_FUNC_CEILL_LIBS],
 [
-  AC_CACHE_VAL([gl_func_ceill_libm], [
-    gl_func_ceill_libm=?
-    AC_TRY_LINK([
-       #ifndef __NO_MATH_INLINES
-       # define __NO_MATH_INLINES 1 /* for glibc */
-       #endif
-       #include <math.h>
-       long double x;],
-      [x = ceill(x);],
-      [gl_func_ceill_libm=])
-    if test "$gl_func_ceill_libm" = "?"; then
+  gl_CACHE_VAL_SILENT([gl_cv_func_ceill_libm], [
+    gl_cv_func_ceill_libm=?
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[#ifndef __NO_MATH_INLINES
+           # define __NO_MATH_INLINES 1 /* for glibc */
+           #endif
+           #include <math.h>
+           long double x;]],
+         [[x = ceill(x);]])],
+      [gl_cv_func_ceill_libm=])
+    if test "$gl_cv_func_ceill_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
-      AC_TRY_LINK([
-         #ifndef __NO_MATH_INLINES
-         # define __NO_MATH_INLINES 1 /* for glibc */
-         #endif
-         #include <math.h>
-         long double x;],
-        [x = ceill(x);],
-        [gl_func_ceill_libm="-lm"])
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#ifndef __NO_MATH_INLINES
+             # define __NO_MATH_INLINES 1 /* for glibc */
+             #endif
+             #include <math.h>
+             long double x;]],
+           [[x = ceill(x);]])],
+        [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  CEILL_LIBM="$gl_func_ceill_libm"
+  CEILL_LIBM="$gl_cv_func_ceill_libm"
 ])