X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffloorf.m4;h=96c9b3bdc74277cf4707475c46f4480bf0fff184;hb=82afcdd;hp=3baadc03d6d5ce538b31d0442943d233e81ee9e0;hpb=1fd8064a06ed3ca83f73c495e998e66c225e395b;p=gnulib.git

diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 3baadc03d..96c9b3bdc 100644
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -1,5 +1,5 @@
-# floorf.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# floorf.m4 serial 7
+dnl Copyright (C) 2007, 2009-2010 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.
@@ -15,14 +15,17 @@ AC_DEFUN([gl_FUNC_FLOORF],
     dnl Test whether floorf() can be used without libm.
     gl_FUNC_FLOORF_LIBS
     if test "$FLOORF_LIBM" = "?"; then
-      FLOORF_LIBM=
+      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
     HAVE_DECL_FLOORF=0
+  fi
+  if test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1; then
     AC_LIBOBJ([floorf])
     FLOORF_LIBM=
   fi
-  AC_SUBST([HAVE_DECL_FLOORF])
   AC_SUBST([FLOORF_LIBM])
 ])
 
@@ -30,29 +33,31 @@ AC_DEFUN([gl_FUNC_FLOORF],
 # Sets FLOORF_LIBM.
 AC_DEFUN([gl_FUNC_FLOORF_LIBS],
 [
-  AC_CACHE_VAL([gl_func_floorf_libm], [
-    gl_func_floorf_libm=?
-    AC_TRY_LINK([
-       #ifndef __NO_MATH_INLINES
-       # define __NO_MATH_INLINES 1 /* for glibc */
-       #endif
-       #include <math.h>
-       float x;],
-      [x = floorf(x);],
-      [gl_func_floorf_libm=])
-    if test "$gl_func_floorf_libm" = "?"; then
+  gl_CACHE_VAL_SILENT([gl_cv_func_floorf_libm], [
+    gl_cv_func_floorf_libm=?
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[#ifndef __NO_MATH_INLINES
+           # define __NO_MATH_INLINES 1 /* for glibc */
+           #endif
+           #include <math.h>
+           float x;]],
+         [[x = floorf(x);]])],
+      [gl_cv_func_floorf_libm=])
+    if test "$gl_cv_func_floorf_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
-      AC_TRY_LINK([
-         #ifndef __NO_MATH_INLINES
-         # define __NO_MATH_INLINES 1 /* for glibc */
-         #endif
-         #include <math.h>
-         float x;],
-        [x = floorf(x);],
-        [gl_func_floorf_libm="-lm"])
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#ifndef __NO_MATH_INLINES
+             # define __NO_MATH_INLINES 1 /* for glibc */
+             #endif
+             #include <math.h>
+             float x;]],
+           [[x = floorf(x);]])],
+        [gl_cv_func_floorf_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  FLOORF_LIBM="$gl_func_floorf_libm"
+  FLOORF_LIBM="$gl_cv_func_floorf_libm"
 ])