X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fceill.m4;h=e1cc48391ba559a7b44f40069e44bca77a470cde;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=5f56df32125d2b7d7445762888ef7abb56a26bf7;hpb=1ac9a623b07722e14367dac9284372881aae3934;p=gnulib.git

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 5f56df321..e1cc48391 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,5 +1,5 @@
-# ceill.m4 serial 12
-dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+# ceill.m4 serial 14
+dnl Copyright (C) 2007, 2009-2014 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.
@@ -25,6 +25,7 @@ AC_DEFUN([gl_FUNC_CEILL],
     fi
     m4_ifdef([gl_FUNC_CEILL_IEEE], [
       if test $gl_ceill_required = ieee && test $REPLACE_CEILL = 0; then
+        AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
         AC_CACHE_CHECK([whether ceill works according to ISO C 99 with IEC 60559],
           [gl_cv_func_ceill_ieee],
           [
@@ -50,7 +51,13 @@ int main (int argc, char *argv[])
               ]])],
               [gl_cv_func_ceill_ieee=yes],
               [gl_cv_func_ceill_ieee=no],
-              [gl_cv_func_ceill_ieee="guessing no"])
+              [case "$host_os" in
+                         # Guess yes on glibc systems.
+                 *-gnu*) gl_cv_func_ceill_ieee="guessing yes" ;;
+                         # If we don't know, assume the worst.
+                 *)      gl_cv_func_ceill_ieee="guessing no" ;;
+               esac
+              ])
             LIBS="$save_LIBS"
           ])
         case "$gl_cv_func_ceill_ieee" in
@@ -86,8 +93,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
            # define __NO_MATH_INLINES 1 /* for glibc */
            #endif
            #include <math.h>
+           long double (*funcptr) (long double) = ceill;
            long double x;]],
-         [[x = ceill(x);]])],
+         [[x = funcptr(x) + ceill(x);]])],
       [gl_cv_func_ceill_libm=])
     if test "$gl_cv_func_ceill_libm" = "?"; then
       save_LIBS="$LIBS"
@@ -98,8 +106,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = ceill;
              long double x;]],
-           [[x = ceill(x);]])],
+           [[x = funcptr(x) + ceill(x);]])],
         [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi