Mercurial > hg > octave-lyh > gnulib-hg
changeset 14996:369a2b1bfba1
isnan: Respect rules for use of AC_LIBOBJ.
* m4/isnan.m4 (gl_ISNAN): Don't do the AC_LIBOBJ and gl_PREREQ_ISNAN*
invocations here.
* modules/isnanf (configure.ac): Require gl_ISNAN if it exists. Test
REPLACE_ISNAN.
* modules/isnand (configure.ac): Likewise.
* modules/isnanl (configure.ac): Likewise.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 21 May 2011 02:21:30 +0200 |
parents | 4e1b0338ea60 |
children | 00d1faea7e94 |
files | ChangeLog m4/isnan.m4 modules/isnand modules/isnanf modules/isnanl |
diffstat | 5 files changed, 24 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-05-20 Bruno Haible <bruno@clisp.org> + + isnan: Respect rules for use of AC_LIBOBJ. + * m4/isnan.m4 (gl_ISNAN): Don't do the AC_LIBOBJ and gl_PREREQ_ISNAN* + invocations here. + * modules/isnanf (configure.ac): Require gl_ISNAN if it exists. Test + REPLACE_ISNAN. + * modules/isnand (configure.ac): Likewise. + * modules/isnanl (configure.ac): Likewise. + 2011-05-20 Bruno Haible <bruno@clisp.org> isnanl*: Respect rules for use of AC_LIBOBJ.
--- a/m4/isnan.m4 +++ b/m4/isnan.m4 @@ -1,4 +1,4 @@ -# isnan.m4 serial 4 +# isnan.m4 serial 5 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, @@ -36,14 +36,8 @@ esac else AC_MSG_RESULT([no]) + dnl REPLACE_ISNAN=1 also makes sure the rpl_isnan[fdl] functions get built. REPLACE_ISNAN=1 - # Make sure the rpl_isnan[fdl] functions get built. - AC_LIBOBJ([isnanf]) - gl_PREREQ_ISNANF - AC_LIBOBJ([isnand]) - gl_PREREQ_ISNAND - AC_LIBOBJ([isnanl]) - gl_PREREQ_ISNANL ISNAN_LIBM= fi AC_SUBST([ISNAN_LIBM])
--- a/modules/isnand +++ b/modules/isnand @@ -15,7 +15,10 @@ configure.ac: gl_FUNC_ISNAND -if test $HAVE_ISNAND = 0; then +m4_ifdef([gl_ISNAN], [ + AC_REQUIRE([gl_ISNAN]) +]) +if test $HAVE_ISNAND = 0 || test $REPLACE_ISNAN = 1; then AC_LIBOBJ([isnand]) gl_PREREQ_ISNAND fi