+2007-10-21 Ben Pfaff <blp@gnu.org>
+
+ * m4/check-libm-func.m4: Removed.
+ * m4/check-math-lib.m4: New file.
+ * m4/round.m4: Rewrite to use gl_CHECK_MATH_LIB.
+ * m4/roundf.m4: Ditto, and fix lack of HAVE_DECL_ROUNDF
+ definition and lack of AC_LIBOBJ([roundf]).
+ * m4/roundl.m4: Ditto, and similarly for roundl.
+ * modules/round: Reference new m4 file.
+ * modules/roundf: Ditto.
+ * modules/roundl: Ditto.
+ * tests/test-round2.c (main): Use ROUND instead of round.
+ Bug report from Bruno Haible.
+
2007-10-21 Bruno Haible <bruno@clisp.org>
* lib/printf-parse.c: Don't assume <stdint.h> exists in IN_LIBASPRINTF
* doc/functions/roundf.texi: Mention roundf module.
* doc/functions/roundl.texi: Mention roundl module.
* MODULES.html.sh: Mention new modules.
+ Thanks to Bruno Haible for suggestions.
2007-10-20 Jim Meyering <meyering@redhat.com>
+++ /dev/null
-# check-libm.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.
-dnl
-dnl AC_CHECK_LIBM_FUNC (MATH_FUNCTION, INVOCATION,
-dnl [RUN-IF-FOUND], [RUN-IF-NOT-FOUND])
-dnl
-dnl Checks for a declaration of the given MATH_FUNCTION in <math.h>, and
-dnl substitutes HAVE_DECL_<func> accordingly. If a declaration is found,
-dnl determines the needed library (if any), assigns it to <func>_LIBM, and
-dnl executes RUN-IF-FOUND; otherwise, executes RUN-IF-NOT-FOUND.
-dnl
-dnl INVOCATION should be a C statement that invokes MATH_FUNCTION, both
-dnl using and assigning back to double variable 'x', e.g. "x = floor
-dnl (x);".
-AC_DEFUN([gl_CHECK_LIBM_FUNC],
-[
-m4_pushdef([FUNC_LIBM], m4_toupper([$1])[_LIBM])dnl
-m4_pushdef([HAVE_DECL_FUNC], HAVE_DECL_[]m4_toupper([$1]))dnl
- AC_CHECK_DECLS([$1], , , [#include <math.h>])
- if test "$ac_cv_have_decl_$1" = yes; then
- save_LIBS=$LIBS
- FUNC_LIBM=?
- for libm in "" "-lm"; do
- LIBS="$save_LIBS $libm"
- AC_TRY_LINK([
- #ifndef __NO_MATH_INLINES
- # define __NO_MATH_INLINES 1 /* for glibc */
- #endif
- #include <math.h>
- double x;],
- [$2],
- [FUNC_LIBM=$libm
-break])
- done
- LIBS=$save_LIBS
- if test "$FUNC_LIBM" = "?"; then
- FUNC_LIBM=
- fi
-m4_ifvaln([$3], [$3])dnl
- else
- HAVE_DECL_FUNC=
- FUNC_LIBM=
-m4_ifvaln([$4], [$4])dnl
- fi
- AC_SUBST(HAVE_DECL_FUNC)
- AC_SUBST(FUNC_LIBM)
-m4_popdef([FUNC_LIBM])
-m4_popdef([HAVE_DECL_FUNC])])
--- /dev/null
+# check-math-lib.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.
+dnl
+dnl AC_CHECK_MATH_LIB (VARIABLE, EXPRESSION)
+dnl
+dnl Checks whether EXPRESSION requires -lm to compile and link. If so, sets
+dnl the shell VARIABLE to -lm, otherwise to the empty string.
+dnl
+dnl Example: AC_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);])
+AC_DEFUN([gl_CHECK_MATH_LIB], [
+ save_LIBS=$LIBS
+ $1=?
+ for libm in "" "-lm"; do
+ LIBS="$save_LIBS $libm"
+ AC_TRY_LINK([
+ #ifndef __NO_MATH_INLINES
+ # define __NO_MATH_INLINES 1 /* for glibc */
+ #endif
+ #include <math.h>
+ double x;],
+ [$2],
+ [$1=$libm
+break])
+ done
+ LIBS=$save_LIBS
+ if test "$$1" = "?"; then
+ $1=
+ fi
+])
-# round.m4 serial 1
+# round.m4 serial 2
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,
AC_REQUIRE([gl_MATH_H_DEFAULTS])
dnl Persuade glibc <math.h> to declare round().
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- gl_CHECK_LIBM_FUNC([round], [x = round(x);], [], [
- AC_REQUIRE([gl_FUNC_FLOOR])
- ROUND_LIBM=$FLOOR_LIBM
- AC_LIBOBJ([round])])])
+ AC_CHECK_DECLS([round], , , [#include <math.h>])
+ if test "$ac_cv_have_decl_round" = yes; then
+ gl_CHECK_MATH_LIB([ROUND_LIBM], [x = round (x);])
+ else
+ gl_CHECK_MATH_LIB([ROUND_LIBM], [x = floor (x) + ceil (x);])
+ HAVE_DECL_ROUND=0
+ AC_LIBOBJ([round])
+ fi
+ AC_SUBST([HAVE_DECL_ROUND])
+ AC_SUBST([ROUND_LIBM])])
-# roundf.m4 serial 1
+# roundf.m4 serial 2
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,
AC_REQUIRE([gl_MATH_H_DEFAULTS])
dnl Persuade glibc <math.h> to declare roundf().
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- dnl Test whether roundf() is declared.
- gl_CHECK_LIBM_FUNC([roundf], [x = roundf(x);], [], [
- dnl No. Are both floorf() and ceilf() available? If so then we can use
- dnl them to implement roundf(), on the assumption that they're fast.
- gl_CHECK_LIBM_FUNC([floorf], [x = floorf(x);], [
- AC_CHECK_DECL([ceilf],
- [dnl Yes. Both are declared. Link against the necessary library.
- ROUNDF_LIBM="$FLOORF_LIBM"],
- [: dnl No. We will use an implementation that doesn't need them.
-], [#include <math.h>
-])])])])
+ AC_CHECK_DECLS([roundf], , , [#include <math.h>])
+ if test "$ac_cv_have_decl_roundf" = yes; then
+ gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);])
+ else
+ AC_CHECK_DECLS([ceilf, floorf], , , [#include <math.h>])
+ if test "$ac_cv_have_decl_floorf" = yes &&
+ test "$ac_cv_have_decl_ceilf" = yes; then
+ gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = floorf (x) + ceilf (x);])
+ else
+ ROUNDF_LIBM=
+ fi
+ HAVE_DECL_ROUNDF=0
+ AC_LIBOBJ([roundf])
+ fi
+ AC_SUBST([HAVE_DECL_ROUNDF])
+ AC_SUBST([ROUNDF_LIBM])
+])
-# roundl.m4 serial 1
+# roundl.m4 serial 2
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,
AC_REQUIRE([gl_MATH_H_DEFAULTS])
dnl Persuade glibc <math.h> to declare roundl().
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- dnl Test whether roundl() is declared.
- gl_CHECK_LIBM_FUNC([roundl], [x = roundl(x);], [], [
- dnl No. Are both floorl() and ceill() available? If so then we can use
- dnl them to implement roundl(), on the assumption that they're fast.
- gl_CHECK_LIBM_FUNC([floorl], [x = floorl(x);], [
- AC_CHECK_DECL([ceill],
- [dnl Yes. Both are declared. Link against the necessary library.
- ROUNDL_LIBM="$FLOORL_LIBM"],
- [: dnl No. We will use an implementation that doesn't need them.
-], [#include <math.h>
-])])])])
+ AC_CHECK_DECLS([roundl], , , [#include <math.h>])
+ if test "$ac_cv_have_decl_roundl" = yes; then
+ gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = roundl (x);])
+ else
+ AC_CHECK_DECLS([ceill, floorl], , , [#include <math.h>])
+ if test "$ac_cv_have_decl_floorl" = yes &&
+ test "$ac_cv_have_decl_ceill" = yes; then
+ gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = floorl (x) + ceill (x);])
+ else
+ ROUNDL_LIBM=
+ fi
+ HAVE_DECL_ROUNDL=0
+ AC_LIBOBJ([roundl])
+ fi
+ AC_SUBST([HAVE_DECL_ROUNDL])
+ AC_SUBST([ROUNDL_LIBM])
+])
Files:
lib/round.c
-m4/check-libm-func.m4
+m4/check-math-lib.m4
m4/round.m4
Depends-on:
Files:
lib/round.c
lib/roundf.c
-m4/check-libm-func.m4
+m4/check-math-lib.m4
m4/roundf.m4
Depends-on:
Files:
lib/round.c
lib/roundl.c
-m4/check-libm-func.m4
+m4/check-math-lib.m4
m4/roundl.m4
Depends-on:
{
DOUBLE ref1 = round_reference1 (x);
DOUBLE ref2 = round_reference2 (x);
- DOUBLE result = round (x);
+ DOUBLE result = ROUND (x);
/* If the reference implementations disagree, bail out immediately. */
if (!equal ("reference implementations disagree", x, ref1, ref2))
projects / pspp / commitdiff