From 13ebbbd5b53127e51b34532465119c97ec6c23ca Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 10:54:40 +0200 Subject: [PATCH] floorl: Respect rules for use of AC_LIBOBJ. * m4/floorl.m4 (gl_FUNC_FLOORL): Move AC_LIBOBJ invocation from here... * modules/floorl (configure.ac): ... to here. --- ChangeLog | 6 ++++++ m4/floorl.m4 | 4 ++-- modules/floorl | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28f7104b4..11ef54954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-21 Bruno Haible + floorl: Respect rules for use of AC_LIBOBJ. + * m4/floorl.m4 (gl_FUNC_FLOORL): Move AC_LIBOBJ invocation from here... + * modules/floorl (configure.ac): ... to here. + +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. diff --git a/m4/floorl.m4 b/m4/floorl.m4 index 2741dd8b1..f21285d24 100644 --- a/m4/floorl.m4 +++ b/m4/floorl.m4 @@ -1,4 +1,4 @@ -# floorl.m4 serial 7 +# floorl.m4 serial 8 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, @@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_FLOORL], HAVE_DECL_FLOORL=0 fi if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then - AC_LIBOBJ([floorl]) + dnl No libraries are needed to link lib/floorl.c. FLOORL_LIBM= fi AC_SUBST([FLOORL_LIBM]) diff --git a/modules/floorl b/modules/floorl index e21199335..9d1bac284 100644 --- a/modules/floorl +++ b/modules/floorl @@ -13,6 +13,9 @@ float [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1] configure.ac: gl_FUNC_FLOORL +if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then + AC_LIBOBJ([floorl]) +fi gl_MATH_MODULE_INDICATOR([floorl]) Makefile.am: -- 2.11.0