X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flogf.m4;h=3992a7665aad106ed9ea3b6fa6d47971e3d27d99;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=3d000c0e237cc828a8aac8e8f47df6201626a7d4;hpb=80a029602f5b2707ca8d2487843ecb9e0df74a6a;p=gnulib.git

diff --git a/m4/logf.m4 b/m4/logf.m4
index 3d000c0e2..3992a7665 100644
--- a/m4/logf.m4
+++ b/m4/logf.m4
@@ -1,5 +1,5 @@
-# logf.m4 serial 4
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# logf.m4 serial 6
+dnl Copyright (C) 2011-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.
@@ -33,6 +33,7 @@ AC_DEFUN([gl_FUNC_LOGF],
 
     m4_ifdef([gl_FUNC_LOGF_IEEE], [
       if test $gl_logf_required = ieee && test $REPLACE_LOGF = 0; then
+        AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
         AC_CACHE_CHECK([whether logf works according to ISO C 99 with IEC 60559],
           [gl_cv_func_logf_ieee],
           [
@@ -55,7 +56,7 @@ numeric_equal (float x, float y)
 static float dummy (float x) { return 0; }
 int main (int argc, char *argv[])
 {
-  float (*my_log) (float) = argc ? logf : dummy;
+  float (*my_logf) (float) = argc ? logf : dummy;
   /* Test logf(negative).
      This test fails on NetBSD 5.1.  */
   float y = my_logf (-1.0f);
@@ -66,7 +67,13 @@ int main (int argc, char *argv[])
               ]])],
               [gl_cv_func_logf_ieee=yes],
               [gl_cv_func_logf_ieee=no],
-              [gl_cv_func_logf_ieee="guessing no"])
+              [case "$host_os" in
+                         # Guess yes on glibc systems.
+                 *-gnu*) gl_cv_func_logf_ieee="guessing yes" ;;
+                         # If we don't know, assume the worst.
+                 *)      gl_cv_func_logf_ieee="guessing no" ;;
+               esac
+              ])
             LIBS="$save_LIBS"
           ])
         case "$gl_cv_func_logf_ieee" in