From 9d1c4ad5a018213d1c034ef36e7ff424774ffb40 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 02:58:01 +0200 Subject: [PATCH] frexpl*: Respect rules for use of AC_LIBOBJ. * m4/frexpl.m4 (gl_FUNC_FREXPL, gl_FUNC_FREXPL_NO_LIBM): Move AC_LIBOBJ invocation from here... * modules/frexpl (configure.ac): ... to here. * modules/frexpl-nolibm (configure.ac): ... and here. --- ChangeLog | 8 ++++++++ m4/frexpl.m4 | 8 +------- modules/frexpl | 3 +++ modules/frexpl-nolibm | 3 +++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 306d6098c..85d665618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-20 Bruno Haible + frexpl*: Respect rules for use of AC_LIBOBJ. + * m4/frexpl.m4 (gl_FUNC_FREXPL, gl_FUNC_FREXPL_NO_LIBM): Move AC_LIBOBJ + invocation from here... + * modules/frexpl (configure.ac): ... to here. + * modules/frexpl-nolibm (configure.ac): ... and here. + +2011-05-20 Bruno Haible + frexp, frexp-nolibm: Move AC_LIBOBJ invocations to module description. * m4/frexp.m4 (gl_FUNC_FREXP, gl_FUNC_FREXP_NO_LIBM): Move AC_LIBOBJ invocation from here... diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index 49d8821ce..63fcb1a8b 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -1,4 +1,4 @@ -# frexpl.m4 serial 13 +# frexpl.m4 serial 14 dnl Copyright (C) 2007-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, @@ -50,9 +50,6 @@ AC_DEFUN([gl_FUNC_FREXPL], [Define if the frexpl() function is available.]) fi fi - if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no; then - AC_LIBOBJ([frexpl]) - fi AC_SUBST([FREXPL_LIBM]) ]) @@ -80,9 +77,6 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM], [Define if the frexpl() function is available in libc.]) fi fi - if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then - AC_LIBOBJ([frexpl]) - fi ]) dnl Test whether frexpl() can be used without linking with libm. diff --git a/modules/frexpl b/modules/frexpl index d1f0159b6..9902aff0e 100644 --- a/modules/frexpl +++ b/modules/frexpl @@ -13,6 +13,9 @@ fpucw [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no] configure.ac: gl_FUNC_FREXPL +if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl = no; then + AC_LIBOBJ([frexpl]) +fi gl_MATH_MODULE_INDICATOR([frexpl]) Makefile.am: diff --git a/modules/frexpl-nolibm b/modules/frexpl-nolibm index dbe1a8282..ec1acd2f0 100644 --- a/modules/frexpl-nolibm +++ b/modules/frexpl-nolibm @@ -14,6 +14,9 @@ fpucw [test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no configure.ac: gl_FUNC_FREXPL_NO_LIBM +if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then + AC_LIBOBJ([frexpl]) +fi gl_MATH_MODULE_INDICATOR([frexpl]) Makefile.am: -- 2.11.0