X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffloorf.m4;h=915e566434f0aa22a84e18a99ae8b7b883d2365d;hb=4097b52187106b6a2940d28968cfecd4e53f9b4e;hp=184c2ee54e62989ce4dbfc5341036ce212f0e4a4;hpb=ab044c631f6655cfacc8ea4b1383f0cb7740326f;p=gnulib.git

diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 184c2ee54..915e56643 100644
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -1,5 +1,5 @@
-# floorf.m4 serial 1
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# floorf.m4 serial 4
+dnl Copyright (C) 2007, 2009 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.
@@ -13,7 +13,29 @@ AC_DEFUN([gl_FUNC_FLOORF],
   AC_CHECK_DECLS([floorf], , , [#include <math.h>])
   if test "$ac_cv_have_decl_floorf" = yes; then
     dnl Test whether floorf() can be used without libm.
-    FLOORF_LIBM=?
+    gl_FUNC_FLOORF_LIBS
+    if test "$FLOORF_LIBM" = "?"; then
+      dnl Sun C 5.0 on Solaris declares floorf() and has it in the system-wide
+      dnl libm.so, but not in the libm.so that the compiler uses.
+      REPLACE_FLOORF=1
+    fi
+  else
+    REPLACE_FLOORF=1
+  fi
+  if test $REPLACE_FLOORF = 1; then
+    AC_LIBOBJ([floorf])
+    FLOORF_LIBM=
+  fi
+  AC_SUBST([REPLACE_FLOORF])
+  AC_SUBST([FLOORF_LIBM])
+])
+
+# Determines the libraries needed to get the floorf() function.
+# Sets FLOORF_LIBM.
+AC_DEFUN([gl_FUNC_FLOORF_LIBS],
+[
+  gl_CACHE_VAL_SILENT([gl_cv_func_floorf_libm], [
+    gl_cv_func_floorf_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -21,8 +43,8 @@ AC_DEFUN([gl_FUNC_FLOORF],
        #include <math.h>
        float x;],
       [x = floorf(x);],
-      [FLOORF_LIBM=])
-    if test "$FLOORF_LIBM" = "?"; then
+      [gl_cv_func_floorf_libm=])
+    if test "$gl_cv_func_floorf_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -32,17 +54,9 @@ AC_DEFUN([gl_FUNC_FLOORF],
          #include <math.h>
          float x;],
         [x = floorf(x);],
-        [FLOORF_LIBM="-lm"])
+        [gl_cv_func_floorf_libm="-lm"])
       LIBS="$save_LIBS"
     fi
-    if test "$FLOORF_LIBM" = "?"; then
-      FLOORF_LIBM=
-    fi
-  else
-    HAVE_DECL_FLOORF=0
-    AC_LIBOBJ([floorf])
-    FLOORF_LIBM=
-  fi
-  AC_SUBST([HAVE_DECL_FLOORF])
-  AC_SUBST([FLOORF_LIBM])
+  ])
+  FLOORF_LIBM="$gl_cv_func_floorf_libm"
 ])