Avoid spurious "(cached)" in configure output.

diff --git a/ChangeLog b/ChangeLog
index ee4e23f..4be0683 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-27  Bruno Haible  <bruno@clisp.org>
+
+       Avoid spurious "(cached)" in configure output.
+       * m4/gnulib-common.m4 (gl_CACHE_VAL_SILENT): New macro.
+       * m4/ceil.m4 (gl_FUNC_CEIL_LIBS): Use it instead of AC_CACHE_VAL.
+       * m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Likewise.
+       * m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Likewise.
+       * m4/floor.m4 (gl_FUNC_FLOOR_LIBS): Likewise.
+       * m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Likewise.
+       * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Likewise.
+       * m4/stdarg.m4 (gl_STDARG_H): Likewise.
+       Reported by Eric Blake.
+
 2009-02-27  Eric Blake  <ebb9@byu.net>
 
        printf: fix regression in previous patch
@@ -10,7 +23,6 @@
        * lib/stdint.in.h: Likewise.
        Suggested by Eric Blake. Reported by Peter Bray <pdb_ml@yahoo.com.au>.
 
-
 2009-02-27  Eric Blake  <ebb9@byu.net>
 
        doc: mention more functions added in cygwin 1.7.0

diff --git a/m4/ceil.m4 b/m4/ceil.m4
index d89dd32..9567686 100644 (file)
--- a/m4/ceil.m4
+++ b/m4/ceil.m4
@@ -1,5 +1,5 @@
-# ceil.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# ceil.m4 serial 3
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_CEIL],
 # Sets CEIL_LIBM.
 AC_DEFUN([gl_FUNC_CEIL_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_ceil_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_ceil_libm], [
     gl_cv_func_ceil_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/ceilf.m4 b/m4/ceilf.m4
index 0eab474..6455ccd 100644 (file)
--- a/m4/ceilf.m4
+++ b/m4/ceilf.m4
@@ -1,5 +1,5 @@
-# ceilf.m4 serial 3
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# ceilf.m4 serial 4
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_CEILF],
 # Sets CEILF_LIBM.
 AC_DEFUN([gl_FUNC_CEILF_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_ceilf_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_ceilf_libm], [
     gl_cv_func_ceilf_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 676c64b..12b3c8f 100644 (file)
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,5 +1,5 @@
-# ceill.m4 serial 3
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# ceill.m4 serial 4
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_CEILL],
 # Sets CEILL_LIBM.
 AC_DEFUN([gl_FUNC_CEILL_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_ceill_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_ceill_libm], [
     gl_cv_func_ceill_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/floor.m4 b/m4/floor.m4
index b950e69..b002f58 100644 (file)
--- a/m4/floor.m4
+++ b/m4/floor.m4
@@ -1,5 +1,5 @@
-# floor.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# floor.m4 serial 3
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_FLOOR],
 # Sets FLOOR_LIBM.
 AC_DEFUN([gl_FUNC_FLOOR_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_floor_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_floor_libm], [
     gl_cv_func_floor_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 8cdaa94..915e566 100644 (file)
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -1,5 +1,5 @@
-# floorf.m4 serial 3
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# floorf.m4 serial 4
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FLOORF],
 # Sets FLOORF_LIBM.
 AC_DEFUN([gl_FUNC_FLOORF_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_floorf_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_floorf_libm], [
     gl_cv_func_floorf_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/floorl.m4 b/m4/floorl.m4
index 6207811..fb0e164 100644 (file)
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -1,5 +1,5 @@
-# floorl.m4 serial 3
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# floorl.m4 serial 4
+dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FLOORL],
 # Sets FLOORL_LIBM.
 AC_DEFUN([gl_FUNC_FLOORL_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_floorl_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_floorl_libm], [
     gl_cv_func_floorl_libm=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 50e399a..c8fda20 100644 (file)
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 10
+# gnulib-common.m4 serial 11
 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -109,3 +109,16 @@ AC_DEFUN([gl_BIGENDIAN],
 [
   AC_C_BIGENDIAN
 ])
+
+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
+# output a spurious "(cached)" mark in the midst of other configure output.
+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
+AC_DEFUN([gl_CACHE_VAL_SILENT],
+[
+  saved_as_echo_n="$as_echo_n"
+  as_echo_n=':'
+  AC_CACHE_VAL([$1], [$2])
+  as_echo_n="$saved_as_echo_n"
+])

diff --git a/m4/stdarg.m4 b/m4/stdarg.m4
index 21910e4..a9ada4f 100644 (file)
--- a/m4/stdarg.m4
+++ b/m4/stdarg.m4
@@ -1,5 +1,5 @@
-# stdarg.m4 serial 2
-dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# stdarg.m4 serial 3
+dnl Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -46,7 +46,7 @@ void (*func) (va_list, va_list) = va_copy;
     else
       dnl Provide a substitute in <config.h>, either __va_copy or as a simple
       dnl assignment.
-      AC_CACHE_VAL([gl_cv_func___va_copy], [
+      gl_CACHE_VAL_SILENT([gl_cv_func___va_copy], [
         AC_TRY_COMPILE([#include <stdarg.h>], [
 #ifndef __va_copy
 error, bail out