+2011-10-09 Bruno Haible <bruno@clisp.org>
+
+ roundl: Simplify for platforms where 'long double' == 'double'.
+ * lib/roundl.c: Include <config.h>.
+ (roundl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New function.
+ * lib/round.c [!USE_LONG_DOUBLE]: Don't include <config.h> a second
+ time.
+ * m4/roundl.m4 (gl_FUNC_ROUNDL): Require gl_LONG_DOUBLE_VS_DOUBLE.
+ Determine ROUNDL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
+ * modules/roundl (Depends-on): Add round. Update conditions.
+
2011-10-09 Bruno Haible <bruno@clisp.org>
truncl: Simplify for platforms where 'long double' == 'double'.
-# roundl.m4 serial 12
+# roundl.m4 serial 13
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
[
m4_divert_text([DEFAULTS], [gl_roundl_required=plain])
AC_REQUIRE([gl_MATH_H_DEFAULTS])
+ AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
dnl Persuade glibc <math.h> to declare roundl().
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
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);])
fi
if test $HAVE_DECL_ROUNDL = 0 || test $REPLACE_ROUNDL = 1; then
dnl Find libraries needed to link lib/roundl.c.
- 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_FUNC_FLOORL_LIBS
- gl_FUNC_CEILL_LIBS
- if test "$FLOORL_LIBM" != '?' && test "$CEILL_LIBM" != '?'; then
- AC_DEFINE([HAVE_FLOORL_AND_CEILL], [1],
- [Define if the both the floorl() and ceill() functions exist.])
- ROUNDL_LIBM=
- dnl Append $FLOORL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
- case " $ROUNDL_LIBM " in
- *" $FLOORL_LIBM "*) ;;
- *) ROUNDL_LIBM="$ROUNDL_LIBM $FLOORL_LIBM" ;;
- esac
- dnl Append $CEILL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
- case " $ROUNDL_LIBM " in
- *" $CEILL_LIBM "*) ;;
- *) ROUNDL_LIBM="$ROUNDL_LIBM $CEILL_LIBM" ;;
- esac
+ if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+ AC_REQUIRE([gl_FUNC_ROUND])
+ ROUNDL_LIBM="$ROUND_LIBM"
+ 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_FUNC_FLOORL_LIBS
+ gl_FUNC_CEILL_LIBS
+ if test "$FLOORL_LIBM" != '?' && test "$CEILL_LIBM" != '?'; then
+ AC_DEFINE([HAVE_FLOORL_AND_CEILL], [1],
+ [Define if the both the floorl() and ceill() functions exist.])
+ ROUNDL_LIBM=
+ dnl Append $FLOORL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
+ case " $ROUNDL_LIBM " in
+ *" $FLOORL_LIBM "*) ;;
+ *) ROUNDL_LIBM="$ROUNDL_LIBM $FLOORL_LIBM" ;;
+ esac
+ dnl Append $CEILL_LIBM to ROUNDL_LIBM, avoiding gratuitous duplicates.
+ case " $ROUNDL_LIBM " in
+ *" $CEILL_LIBM "*) ;;
+ *) ROUNDL_LIBM="$ROUNDL_LIBM $CEILL_LIBM" ;;
+ esac
+ else
+ ROUNDL_LIBM=
+ fi
else
ROUNDL_LIBM=
fi
- else
- ROUNDL_LIBM=
fi
fi
AC_SUBST([ROUNDL_LIBM])