From ba755304261567ce2bb5672bc991c083a77a2911 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 01:37:23 +0200 Subject: [PATCH] isnan*: Separate the AC_LIBOBJ invocations. * m4/isnanf.m4 (gl_PREREQ_ISNANF): Renamed from gl_BUILD_ISNANF. Remove AC_LIBOBJ invocation. (gl_FUNC_ISNANF, gl_FUNC_ISNANF_NO_LIBM): Update. Invoke AC_LIBOBJ here. * m4/isnand.m4 (gl_PREREQ_ISNAND): Renamed from gl_BUILD_ISNAND. Remove AC_LIBOBJ invocation. (gl_FUNC_ISNAND, gl_FUNC_ISNAND_NO_LIBM): Update. Invoke AC_LIBOBJ here. * m4/isnanl.m4 (gl_PREREQ_ISNANL): Renamed from gl_BUILD_ISNANL. Remove AC_LIBOBJ invocation. (gl_FUNC_ISNANL, gl_FUNC_ISNANL_NO_LIBM): Update. Invoke AC_LIBOBJ here. * m4/isnan.m4 (gl_ISNAN): Update. Invoke AC_LIBOBJ here. --- ChangeLog | 17 +++++++++++++++++ m4/isnan.m4 | 11 +++++++---- m4/isnand.m4 | 13 +++++++------ m4/isnanf.m4 | 13 +++++++------ m4/isnanl.m4 | 13 +++++++------ 5 files changed, 45 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fd5e5da9..0918fafb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2011-05-20 Bruno Haible + + isnan*: Separate the AC_LIBOBJ invocations. + * m4/isnanf.m4 (gl_PREREQ_ISNANF): Renamed from gl_BUILD_ISNANF. Remove + AC_LIBOBJ invocation. + (gl_FUNC_ISNANF, gl_FUNC_ISNANF_NO_LIBM): Update. Invoke AC_LIBOBJ + here. + * m4/isnand.m4 (gl_PREREQ_ISNAND): Renamed from gl_BUILD_ISNAND. Remove + AC_LIBOBJ invocation. + (gl_FUNC_ISNAND, gl_FUNC_ISNAND_NO_LIBM): Update. Invoke AC_LIBOBJ + here. + * m4/isnanl.m4 (gl_PREREQ_ISNANL): Renamed from gl_BUILD_ISNANL. Remove + AC_LIBOBJ invocation. + (gl_FUNC_ISNANL, gl_FUNC_ISNANL_NO_LIBM): Update. Invoke AC_LIBOBJ + here. + * m4/isnan.m4 (gl_ISNAN): Update. Invoke AC_LIBOBJ here. + 2011-05-08 Bruno Haible isinf: Move AC_LIBOBJ invocations to module description. diff --git a/m4/isnan.m4 b/m4/isnan.m4 index dc3e290cd..0c5e78328 100644 --- a/m4/isnan.m4 +++ b/m4/isnan.m4 @@ -1,4 +1,4 @@ -# isnan.m4 serial 3 +# isnan.m4 serial 4 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, @@ -38,9 +38,12 @@ AC_DEFUN([gl_ISNAN], AC_MSG_RESULT([no]) REPLACE_ISNAN=1 # Make sure the rpl_isnan[fdl] functions get built. - gl_BUILD_ISNANF - gl_BUILD_ISNAND - gl_BUILD_ISNANL + 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]) diff --git a/m4/isnand.m4 b/m4/isnand.m4 index fb2c0f9be..b000ab526 100644 --- a/m4/isnand.m4 +++ b/m4/isnand.m4 @@ -1,4 +1,4 @@ -# isnand.m4 serial 8 +# isnand.m4 serial 9 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, @@ -24,7 +24,8 @@ AC_DEFUN([gl_FUNC_ISNAND], else gl_func_isnand=no HAVE_ISNAND=0 - gl_BUILD_ISNAND + AC_LIBOBJ([isnand]) + gl_PREREQ_ISNAND fi AC_SUBST([ISNAND_LIBM]) ]) @@ -38,14 +39,14 @@ AC_DEFUN([gl_FUNC_ISNAND_NO_LIBM], AC_DEFINE([HAVE_ISNAND_IN_LIBC], [1], [Define if the isnan(double) function is available in libc.]) else - gl_BUILD_ISNAND + AC_LIBOBJ([isnand]) + gl_PREREQ_ISNAND fi ]) -dnl Pull in replacement isnand definition. It does not need -lm. -AC_DEFUN([gl_BUILD_ISNAND], +dnl Prerequisites of replacement isnand definition. It does not need -lm. +AC_DEFUN([gl_PREREQ_ISNAND], [ - AC_LIBOBJ([isnand]) gl_DOUBLE_EXPONENT_LOCATION ]) diff --git a/m4/isnanf.m4 b/m4/isnanf.m4 index f4aa44d5a..63a090bbc 100644 --- a/m4/isnanf.m4 +++ b/m4/isnanf.m4 @@ -1,4 +1,4 @@ -# isnanf.m4 serial 12 +# isnanf.m4 serial 13 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, @@ -33,7 +33,8 @@ AC_DEFUN([gl_FUNC_ISNANF], fi if test $gl_func_isnanf != yes; then HAVE_ISNANF=0 - gl_BUILD_ISNANF + AC_LIBOBJ([isnanf]) + gl_PREREQ_ISNANF fi AC_SUBST([ISNANF_LIBM]) ]) @@ -55,14 +56,14 @@ AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM], AC_DEFINE([HAVE_ISNANF_IN_LIBC], [1], [Define if the isnan(float) function is available in libc.]) else - gl_BUILD_ISNANF + AC_LIBOBJ([isnanf]) + gl_PREREQ_ISNANF fi ]) -dnl Pull in replacement isnanf definition. It does not need -lm. -AC_DEFUN([gl_BUILD_ISNANF], +dnl Prerequisites of replacement isnanf definition. It does not need -lm. +AC_DEFUN([gl_PREREQ_ISNANF], [ - AC_LIBOBJ([isnanf]) gl_FLOAT_EXPONENT_LOCATION ]) diff --git a/m4/isnanl.m4 b/m4/isnanl.m4 index 4c94b4d2a..e6b10c3eb 100644 --- a/m4/isnanl.m4 +++ b/m4/isnanl.m4 @@ -1,4 +1,4 @@ -# isnanl.m4 serial 14 +# isnanl.m4 serial 15 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, @@ -31,7 +31,8 @@ AC_DEFUN([gl_FUNC_ISNANL], fi if test $gl_func_isnanl != yes; then HAVE_ISNANL=0 - gl_BUILD_ISNANL + AC_LIBOBJ([isnanl]) + gl_PREREQ_ISNANL fi AC_SUBST([ISNANL_LIBM]) ]) @@ -51,14 +52,14 @@ AC_DEFUN([gl_FUNC_ISNANL_NO_LIBM], AC_DEFINE([HAVE_ISNANL_IN_LIBC], [1], [Define if the isnan(long double) function is available in libc.]) else - gl_BUILD_ISNANL + AC_LIBOBJ([isnanl]) + gl_PREREQ_ISNANL fi ]) -dnl Pull in replacement isnanl definition. It does not need -lm. -AC_DEFUN([gl_BUILD_ISNANL], +dnl Prerequisites of replacement isnanl definition. It does not need -lm. +AC_DEFUN([gl_PREREQ_ISNANL], [ - AC_LIBOBJ([isnanl]) gl_LONG_DOUBLE_EXPONENT_LOCATION ]) -- 2.11.0