diff options
author | Bruno Haible <bruno@clisp.org> | 2011-10-10 01:05:53 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2011-10-10 01:05:53 +0200 |
commit | 3d57d93ced65ddec292e320e35fb648dff34cd83 (patch) | |
tree | b41573a7f33613254a8949a5152bbbab1e5c80b5 /m4/truncl.m4 | |
parent | 1ac9a623b07722e14367dac9284372881aae3934 (diff) | |
download | gnulib-3d57d93ced65ddec292e320e35fb648dff34cd83.tar.gz |
truncl: Simplify for platforms where 'long double' == 'double'.
* lib/truncl.c: Include <config.h>.
(truncl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New function.
* lib/trunc.c [!USE_LONG_DOUBLE]: Don't include <config.h> a second
time.
* m4/truncl.m4 (gl_FUNC_TRUNCL): Require gl_LONG_DOUBLE_VS_DOUBLE.
Determine TRUNCL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
* modules/truncl (Depends-on): Add trunc. Update conditions.
Diffstat (limited to 'm4/truncl.m4')
-rw-r--r-- | m4/truncl.m4 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/m4/truncl.m4 b/m4/truncl.m4 index e6110c33f6..c4a99719a2 100644 --- a/m4/truncl.m4 +++ b/m4/truncl.m4 @@ -1,4 +1,4 @@ -# truncl.m4 serial 9 +# truncl.m4 serial 10 dnl Copyright (C) 2007-2008, 2010-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, @@ -8,9 +8,12 @@ AC_DEFUN([gl_FUNC_TRUNCL], [ m4_divert_text([DEFAULTS], [gl_truncl_required=plain]) AC_REQUIRE([gl_MATH_H_DEFAULTS]) + AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl Persuade glibc <math.h> to declare truncl(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + dnl Test whether truncl() is declared. AC_CHECK_DECLS([truncl], , , [[#include <math.h>]]) if test "$ac_cv_have_decl_truncl" = yes; then @@ -109,8 +112,13 @@ int main (int argc, char *argv[]) HAVE_DECL_TRUNCL=0 fi if test $HAVE_DECL_TRUNCL = 0 || test $REPLACE_TRUNCL = 1; then - dnl No libraries are needed to link lib/truncl.c. - TRUNCL_LIBM= + dnl Find libraries needed to link lib/truncl.c. + if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then + AC_REQUIRE([gl_FUNC_TRUNC]) + TRUNCL_LIBM="$TRUNC_LIBM" + else + TRUNCL_LIBM= + fi fi AC_SUBST([TRUNCL_LIBM]) ]) |