X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fceill.m4;h=71ab316d0120777c5c5c6cd95eed307f58a1a5db;hb=eb6dce1d3a40d4d24422ab59856a6dd193b79de5;hp=7413a3110cfc10a10eefa99c35e132ccde39d210;hpb=d23df56e2060a3f468b8c6b069c0b87f6c15b774;p=gnulib.git

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 7413a3110..71ab316d0 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,5 +1,5 @@
-# ceill.m4 serial 1
-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.
@@ -13,7 +13,29 @@ AC_DEFUN([gl_FUNC_CEILL],
   AC_CHECK_DECLS([ceill], , , [#include <math.h>])
   if test "$ac_cv_have_decl_ceill" = yes; then
     dnl Test whether ceill() can be used without libm.
-    CEILL_LIBM=?
+    gl_FUNC_CEILL_LIBS
+    if test "$CEILL_LIBM" = "?"; then
+      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
+    REPLACE_CEILL=1
+  fi
+  if test $REPLACE_CEILL = 1; then
+    AC_LIBOBJ([ceill])
+    CEILL_LIBM=
+  fi
+  AC_SUBST([REPLACE_CEILL])
+  AC_SUBST([CEILL_LIBM])
+])
+
+# Determines the libraries needed to get the ceill() function.
+# Sets CEILL_LIBM.
+AC_DEFUN([gl_FUNC_CEILL_LIBS],
+[
+  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 */
@@ -21,8 +43,8 @@ AC_DEFUN([gl_FUNC_CEILL],
        #include <math.h>
        long double x;],
       [x = ceill(x);],
-      [CEILL_LIBM=])
-    if test "$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([
@@ -32,17 +54,9 @@ AC_DEFUN([gl_FUNC_CEILL],
          #include <math.h>
          long double x;],
         [x = ceill(x);],
-        [CEILL_LIBM="-lm"])
+        [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi
-    if test "$CEILL_LIBM" = "?"; then
-      CEILL_LIBM=
-    fi
-  else
-    HAVE_DECL_CEILL=0
-    AC_LIBOBJ([ceill])
-    CEILL_LIBM=
-  fi
-  AC_SUBST([HAVE_DECL_CEILL])
-  AC_SUBST([CEILL_LIBM])
+  ])
+  CEILL_LIBM="$gl_cv_func_ceill_libm"
 ])