New module 'ceill'.

diff --git a/ChangeLog b/ChangeLog
index 6f7bd02a9e053ca0da54f4741490c0e218ba3ec7..2f226a456193b24715f460e8ffb0652c73644ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-04  Bruno Haible  <bruno@clisp.org>
+
+       * modules/ceill: New file.
+       * lib/ceill.c: Replace entire file.
+       * m4/ceill.m4: New file.
+       * lib/math.in.h (ceill): Replace declaration.
+       * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize GNULIB_CEILL.
+       * modules/math (Makefile.am): Substitute also GNULIB_CEILL.
+       * doc/functions/ceill.texi: Mention the 'ceill' module.
+       * modules/mathl (Files): Remove lib/ceill.c.
+       (Depends-on): Add ceill.
+
 2007-10-04  Bruno Haible  <bruno@clisp.org>
 
        * modules/ceilf-tests: New file.

diff --git a/doc/functions/ceill.texi b/doc/functions/ceill.texi
index ed5006fd8ab26788223ae35cfbd09dcf56263f35..eb12db2b23b1e907f503b062c21656060a0372bd 100644 (file)
--- a/doc/functions/ceill.texi
+++ b/doc/functions/ceill.texi
@@ -4,15 +4,15 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/ceill.html}
 
-Gnulib module: ---
+Gnulib module: ceill
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+FreeBSD 5.2.1, NetBSD 3.0, OpenBSD 3.8, HP-UX 11, IRIX 6.5, Solaris 9, Cygwin, Interix 3.5, BeOS.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
-@item
-This function is missing on some platforms:
-FreeBSD 5.2.1, NetBSD 3.0, OpenBSD 3.8, HP-UX 11, IRIX 6.5, Solaris 9, Cygwin, Interix 3.5, BeOS.
 @end itemize

diff --git a/lib/ceill.c b/lib/ceill.c
index 9eb1ba07c243e608f533f96002e9b3d8b3870e78..4c65cd2dfd02b3db149ac52bf3c83a3539501c8e 100644 (file)
--- a/lib/ceill.c
+++ b/lib/ceill.c
@@ -1,9 +1,5 @@
-/* Emulation for ceill.
-   Contributed by Paolo Bonzini
-
-   Copyright 2002, 2003, 2007 Free Software Foundation, Inc.
-
-   This file is part of gnulib.
+/* Round towards positive infinity.
+   Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,28 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
-
-/* Specification.  */
-#include <math.h>
-
-#include <float.h>
-
-/* To compute the integer part of X, sum a big enough
-   integer so that the precision of the floating point
-   number is exactly 1.  */
-
-long double
-ceill(long double x)
-{
-  long double y;
-  if (x < 0.0L)
-    y = -(1.0L / LDBL_EPSILON - x - 1.0 / LDBL_EPSILON);
-  else
-    y = 1.0L / LDBL_EPSILON + x - 1.0 / LDBL_EPSILON;
+/* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-  if (y < x)
-    return y + 1.0L;
-  else
-    return y;
-}
+#define USE_LONG_DOUBLE
+#include "ceil.c"

diff --git a/lib/math.in.h b/lib/math.in.h
index ef0682af58c30354d0b952b65180f49f5f557307..b5dc1ea1e682388e311dac02405b2ad32c0c7322 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -103,14 +103,16 @@ extern float ceilf (float x);
      ceilf (x))
 #endif
 
-#if @GNULIB_MATHL@ || !@HAVE_DECL_CEILL@
+#if @GNULIB_CEILL@
+# if !@HAVE_DECL_CEILL@
+#  define ceill rpl_ceill
 extern long double ceill (long double x);
-#endif
-#if !@GNULIB_MATHL@ && defined GNULIB_POSIXCHECK
+# endif
+#elif defined GNULIB_POSIXCHECK
 # undef ceill
 # define ceill(x) \
     (GL_LINK_WARNING ("ceill is unportable - " \
-                      "use gnulib module mathl for portability"), \
+                      "use gnulib module ceill for portability"), \
      ceill (x))
 #endif
 

diff --git a/m4/ceill.m4 b/m4/ceill.m4
new file mode 100644 (file)
index 0000000..7413a31
--- /dev/null
+++ b/m4/ceill.m4
@@ -0,0 +1,48 @@
+# ceill.m4 serial 1
+dnl Copyright (C) 2007 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.
+
+AC_DEFUN([gl_FUNC_CEILL],
+[
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  dnl Persuade glibc <math.h> to declare ceill().
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  dnl Test whether ceill() is declared.
+  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=?
+    AC_TRY_LINK([
+       #ifndef __NO_MATH_INLINES
+       # define __NO_MATH_INLINES 1 /* for glibc */
+       #endif
+       #include <math.h>
+       long double x;],
+      [x = ceill(x);],
+      [CEILL_LIBM=])
+    if test "$CEILL_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>
+         long double x;],
+        [x = ceill(x);],
+        [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])
+])

diff --git a/m4/math_h.m4 b/m4/math_h.m4
index 76d5dbc591039fc42f73732e3cd3d59ae35dda68..5539d792f5e1cbdc5f90b3c61eb84d2a6d6ec089 100644 (file)
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -20,6 +20,7 @@ AC_DEFUN([gl_MATH_MODULE_INDICATOR],
 AC_DEFUN([gl_MATH_H_DEFAULTS],
 [
   GNULIB_CEILF=0;   AC_SUBST([GNULIB_CEILF])
+  GNULIB_CEILL=0;   AC_SUBST([GNULIB_CEILL])
   GNULIB_FLOORF=0;  AC_SUBST([GNULIB_FLOORF])
   GNULIB_FLOORL=0;  AC_SUBST([GNULIB_FLOORL])
   GNULIB_FREXP=0;   AC_SUBST([GNULIB_FREXP])

diff --git a/modules/ceill b/modules/ceill
new file mode 100644 (file)
index 0000000..a2365c2
--- /dev/null
+++ b/modules/ceill
@@ -0,0 +1,31 @@
+Description:
+ceill() function: round towards positive infinity.
+
+Files:
+lib/ceill.c
+lib/ceil.c
+m4/ceill.m4
+
+Depends-on:
+math
+extensions
+float
+
+configure.ac:
+gl_FUNC_CEILL
+gl_MATH_MODULE_INDICATOR([ceill])
+
+Makefile.am:
+
+Include:
+<math.h>
+
+Link:
+$(CEILL_LIBM)
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/math b/modules/math
index 0a41904d659f8829e26770c951e796a43a9a6ff4..15e16e633f76b31ba2e84ad34edf9663f87042fa 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -23,6 +23,7 @@ math.h: math.in.h
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
              -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \
              -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
+             -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \
              -e 's|@''GNULIB_FLOORF''@|$(GNULIB_FLOORF)|g' \
              -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \
              -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \

diff --git a/modules/mathl b/modules/mathl
index 1008cba64aa27deac4aa6fcebb3f3c929e7eafc9..e8ee822590bfbeaece150e481968a4dca4d7b1e6 100644 (file)
--- a/modules/mathl
+++ b/modules/mathl
@@ -5,7 +5,6 @@ Files:
 lib/acosl.c
 lib/asinl.c
 lib/atanl.c
-lib/ceill.c
 lib/cosl.c
 lib/expl.c
 lib/logl.c
@@ -24,6 +23,7 @@ frexpl
 isnanl
 ldexpl
 floorl
+ceill
 
 configure.ac:
 gl_FUNC_LONG_DOUBLE_MATH