X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fceilf.m4;h=91940c12fec8490a87bf7f087cfbf03a53f78f2c;hb=fc80165c92e8b92da6e88e4fdb9c472125124fa0;hp=65f10bedef744a2e1295bc933ae13fd73a89fb2f;hpb=b064d497f3f612ba40acccbe3dcaccec7980ee39;p=gnulib.git

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