From: Bruno Haible Date: Sat, 21 May 2011 09:23:03 +0000 (+0200) Subject: roundf: Move AC_LIBOBJ invocations to module description. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc86dda9ca916de94b03764e3e0455821676c08;p=pspp roundf: Move AC_LIBOBJ invocations to module description. * m4/roundf.m4 (gl_FUNC_ROUNDF): Move AC_LIBOBJ invocation from here... * modules/roundf (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index 82ce8d87a6..678be92a9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-21 Bruno Haible + + roundf: Move AC_LIBOBJ invocations to module description. + * m4/roundf.m4 (gl_FUNC_ROUNDF): Move AC_LIBOBJ invocation from here... + * modules/roundf (configure.ac): ... to here. + 2011-05-21 Bruno Haible truncl: Move AC_LIBOBJ invocations to module description. diff --git a/m4/roundf.m4 b/m4/roundf.m4 index a2a1464e68..0ff964608d 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,4 +1,4 @@ -# roundf.m4 serial 10 +# roundf.m4 serial 11 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, @@ -89,7 +89,7 @@ int main() HAVE_DECL_ROUNDF=0 fi if test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1; then - AC_LIBOBJ([roundf]) + dnl Find libraries needed to link lib/roundf.c. AC_CHECK_DECLS([ceilf, floorf], , , [#include ]) if test "$ac_cv_have_decl_floorf" = yes \ && test "$ac_cv_have_decl_ceilf" = yes; then diff --git a/modules/roundf b/modules/roundf index d9c283eb33..86d758b90d 100644 --- a/modules/roundf +++ b/modules/roundf @@ -16,6 +16,9 @@ float [test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1] configure.ac: gl_FUNC_ROUNDF +if test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1; then + AC_LIBOBJ([roundf]) +fi gl_MATH_MODULE_INDICATOR([roundf]) Makefile.am: