From 226af9532797ac05a819785401323f0858286c3f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 10:52:34 +0200 Subject: [PATCH] floor: Respect rules for use of AC_LIBOBJ. * m4/floor.m4 (gl_FUNC_FLOOR): Move AC_LIBOBJ invocation from here... * modules/floor (configure.ac): ... to here. --- ChangeLog | 6 ++++++ m4/floor.m4 | 4 ++-- modules/floor | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c30c05957..28f7104b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-21 Bruno Haible + floor: Respect rules for use of AC_LIBOBJ. + * m4/floor.m4 (gl_FUNC_FLOOR): Move AC_LIBOBJ invocation from here... + * modules/floor (configure.ac): ... to here. + +2011-05-21 Bruno Haible + floorf: Move AC_LIBOBJ invocations to module description. * m4/floorf.m4 (gl_FUNC_FLOORF): Move AC_LIBOBJ invocation from here... * modules/floorf (configure.ac): ... to here. diff --git a/m4/floor.m4 b/m4/floor.m4 index 568310785..62d19fed7 100644 --- a/m4/floor.m4 +++ b/m4/floor.m4 @@ -1,4 +1,4 @@ -# floor.m4 serial 5 +# floor.m4 serial 6 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, @@ -48,7 +48,7 @@ int main() fi ]) if test $REPLACE_FLOOR = 1; then - AC_LIBOBJ([floor]) + dnl No libraries are needed to link lib/floor.c. FLOOR_LIBM= fi AC_SUBST([FLOOR_LIBM]) diff --git a/modules/floor b/modules/floor index 1393dadad..c4c71e9a3 100644 --- a/modules/floor +++ b/modules/floor @@ -11,6 +11,9 @@ float [test $REPLACE_FLOOR = 1] configure.ac: gl_FUNC_FLOOR +if test $REPLACE_FLOOR = 1; then + AC_LIBOBJ([floor]) +fi gl_MATH_MODULE_INDICATOR([floor]) Makefile.am: -- 2.11.0