X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fceill.m4;h=71ab316d0120777c5c5c6cd95eed307f58a1a5db;hb=f1195ccd1ee2cd56ed6b82a76fdee8de0c3d78b7;hp=577bc55369c2aad65d46fc31e95b4c83ccb75674;hpb=1fd8064a06ed3ca83f73c495e998e66c225e395b;p=gnulib.git

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 577bc5536..71ab316d0 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,5 +1,5 @@
-# ceill.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# ceill.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.
@@ -15,14 +15,18 @@ AC_DEFUN([gl_FUNC_CEILL],
     dnl Test whether ceill() can be used without libm.
     gl_FUNC_CEILL_LIBS
     if test "$CEILL_LIBM" = "?"; then
-      CEILL_LIBM=
+      dnl Sun C 5.0 on Solaris declares ceill() and has it in the system-wide
+      dnl libm.so, but not in the libm.so that the compiler uses.
+      REPLACE_CEILL=1
     fi
   else
-    HAVE_DECL_CEILL=0
+    REPLACE_CEILL=1
+  fi
+  if test $REPLACE_CEILL = 1; then
     AC_LIBOBJ([ceill])
     CEILL_LIBM=
   fi
-  AC_SUBST([HAVE_DECL_CEILL])
+  AC_SUBST([REPLACE_CEILL])
   AC_SUBST([CEILL_LIBM])
 ])
 
@@ -30,8 +34,8 @@ AC_DEFUN([gl_FUNC_CEILL],
 # Sets CEILL_LIBM.
 AC_DEFUN([gl_FUNC_CEILL_LIBS],
 [
-  AC_CACHE_VAL([gl_func_ceill_libm], [
-    gl_func_ceill_libm=?
+  gl_CACHE_VAL_SILENT([gl_cv_func_ceill_libm], [
+    gl_cv_func_ceill_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
        # define __NO_MATH_INLINES 1 /* for glibc */
@@ -39,8 +43,8 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
        #include <math.h>
        long double x;],
       [x = ceill(x);],
-      [gl_func_ceill_libm=])
-    if test "$gl_func_ceill_libm" = "?"; then
+      [gl_cv_func_ceill_libm=])
+    if test "$gl_cv_func_ceill_libm" = "?"; then
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_TRY_LINK([
@@ -50,9 +54,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS],
          #include <math.h>
          long double x;],
         [x = ceill(x);],
-        [gl_func_ceill_libm="-lm"])
+        [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi
   ])
-  CEILL_LIBM="$gl_func_ceill_libm"
+  CEILL_LIBM="$gl_cv_func_ceill_libm"
 ])