X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flog1pf.m4;h=7dcd1bd0972bc213d76430b7faa31995280f3956;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=0f75e94ce53f43ef473f2b436eba65e12c64e43d;hpb=80a029602f5b2707ca8d2487843ecb9e0df74a6a;p=gnulib.git

diff --git a/m4/log1pf.m4 b/m4/log1pf.m4
index 0f75e94ce..7dcd1bd09 100644
--- a/m4/log1pf.m4
+++ b/m4/log1pf.m4
@@ -1,5 +1,5 @@
-# log1pf.m4 serial 2
-dnl Copyright (C) 2012 Free Software Foundation, Inc.
+# log1pf.m4 serial 3
+dnl Copyright (C) 2012-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_LOG1PF],
 
     m4_ifdef([gl_FUNC_LOG1PF_IEEE], [
       if test $gl_log1pf_required = ieee && test $REPLACE_LOG1PF = 0; then
+        AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
         AC_CACHE_CHECK([whether log1pf works according to ISO C 99 with IEC 60559],
           [gl_cv_func_log1pf_ieee],
           [
@@ -59,7 +60,13 @@ int main (int argc, char *argv[])
               ]])],
               [gl_cv_func_log1pf_ieee=yes],
               [gl_cv_func_log1pf_ieee=no],
-              [gl_cv_func_log1pf_ieee="guessing no"])
+              [case "$host_os" in
+                         # Guess yes on glibc systems.
+                 *-gnu*) gl_cv_func_log1pf_ieee="guessing yes" ;;
+                         # If we don't know, assume the worst.
+                 *)      gl_cv_func_log1pf_ieee="guessing no" ;;
+               esac
+              ])
             LIBS="$save_LIBS"
           ])
         case "$gl_cv_func_log1pf_ieee" in