X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Flog10f.m4;h=c2cfcca6554050e1f5b1e3c051a94c7635f7d895;hb=9be0b54cb42e404e3e355c800b23537416acbc1f;hp=e2dc60d7fe204db47532217dabab2fc01f8d1c07;hpb=d4b6128e5b83f528e79259585977a126ce29c7a8;p=gnulib.git

diff --git a/m4/log10f.m4 b/m4/log10f.m4
index e2dc60d7f..c2cfcca65 100644
--- a/m4/log10f.m4
+++ b/m4/log10f.m4
@@ -1,5 +1,5 @@
-# log10f.m4 serial 4
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# log10f.m4 serial 6
+dnl Copyright (C) 2011-2013 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,11 +33,12 @@ AC_DEFUN([gl_FUNC_LOG10F],
 
     m4_ifdef([gl_FUNC_LOG10F_IEEE], [
       if test $gl_log10f_required = ieee && test $REPLACE_LOG10F = 0; then
+        AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
         AC_CACHE_CHECK([whether log10f works according to ISO C 99 with IEC 60559],
           [gl_cv_func_log10f_ieee],
           [
             save_LIBS="$LIBS"
-            LIBS="$LIBS $LOGF_LIBM"
+            LIBS="$LIBS $LOG10F_LIBM"
             AC_RUN_IFELSE(
               [AC_LANG_SOURCE([[
 #ifndef __NO_MATH_INLINES
@@ -66,7 +67,13 @@ int main (int argc, char *argv[])
               ]])],
               [gl_cv_func_log10f_ieee=yes],
               [gl_cv_func_log10f_ieee=no],
-              [gl_cv_func_log10f_ieee="guessing no"])
+              [case "$host_os" in
+                         # Guess yes on glibc systems.
+                 *-gnu*) gl_cv_func_log10f_ieee="guessing yes" ;;
+                         # If we don't know, assume the worst.
+                 *)      gl_cv_func_log10f_ieee="guessing no" ;;
+               esac
+              ])
             LIBS="$save_LIBS"
           ])
         case "$gl_cv_func_log10f_ieee" in