From 9b04fa9118b7d033876b407d5bb936fed9d2e23c Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 27 Jul 2010 17:41:47 +0000
Subject: [PATCH] acinclude.m4 ([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS]): Fix
 messages.

2010-07-27  Paolo Carlini  <paolo.carlini@oracle.com>

	* acinclude.m4 ([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS]): Fix
	messages.
	* configure: Regenerate.

From-SVN: r162580
---
 libstdc++-v3/ChangeLog    |  6 ++++++
 libstdc++-v3/acinclude.m4 | 11 +++--------
 libstdc++-v3/configure    | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e435f9f2e39..ea4c2ebac90 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* acinclude.m4 ([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS]): Fix
+	messages.
+	* configure: Regenerate.
+
 2010-07-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/ext/vstring_util.h: Include bits/range_access.h.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 8977f3d7cb7..5c856baab8d 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1623,32 +1623,27 @@ dnl Compute the EOF, SEEK_CUR, and SEEK_END integer constants.
 dnl
 AC_DEFUN([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS], [
 
-  AC_MSG_CHECKING([For some <stdio.h> integer constants.])
-
-  AC_CACHE_VAL(glibcxx_cv_stdio_eof, [
+  AC_CACHE_CHECK([for the value of EOF], glibcxx_cv_stdio_eof, [
   AC_COMPUTE_INT([glibcxx_cv_stdio_eof], [[EOF]],
                  [#include <stdio.h>],
                  [AC_MSG_ERROR([computing EOF failed])])
   ])
-  AC_MSG_RESULT($glibcxx_cv_stdio_eof)
   AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_EOF, $glibcxx_cv_stdio_eof,
                      [Define to the value of the EOF integer constant.])
 
-  AC_CACHE_VAL(glibcxx_cv_stdio_seek_cur, [
+  AC_CACHE_CHECK([for the value of SEEK_CUR], glibcxx_cv_stdio_seek_cur, [
   AC_COMPUTE_INT([glibcxx_cv_stdio_seek_cur], [[SEEK_CUR]],
                  [#include <stdio.h>],
                  [AC_MSG_ERROR([computing SEEK_CUR failed])])
   ])
-  AC_MSG_RESULT($glibcxx_cv_stdio_seek_cur)
   AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_SEEK_CUR, $glibcxx_cv_stdio_seek_cur,
                      [Define to the value of the SEEK_CUR integer constant.])
 
-  AC_CACHE_VAL(glibcxx_cv_stdio_seek_end, [
+  AC_CACHE_CHECK([for the value of SEEK_END], glibcxx_cv_stdio_seek_end, [
   AC_COMPUTE_INT([glibcxx_cv_stdio_seek_end], [[SEEK_END]],
                  [#include <stdio.h>],
                  [AC_MSG_ERROR([computing SEEK_END failed])])
   ])
-  AC_MSG_RESULT($glibcxx_cv_stdio_seek_end)
   AC_DEFINE_UNQUOTED(_GLIBCXX_STDIO_SEEK_END, $glibcxx_cv_stdio_seek_end,
                      [Define to the value of the SEEK_END integer constant.])
 ])
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 2e6affaf740..c78413286f3 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -18679,10 +18679,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # For the EOF, SEEK_CUR, and SEEK_END integer constants.
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking For some <stdio.h> integer constants." >&5
-$as_echo_n "checking For some <stdio.h> integer constants.... " >&6; }
-
-  if test "${glibcxx_cv_stdio_eof+set}" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the value of EOF" >&5
+$as_echo_n "checking for the value of EOF... " >&6; }
+if test "${glibcxx_cv_stdio_eof+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18694,8 +18693,7 @@ fi
 
 
 fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_eof" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_eof" >&5
 $as_echo "$glibcxx_cv_stdio_eof" >&6; }
 
 cat >>confdefs.h <<_ACEOF
@@ -18703,7 +18701,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  if test "${glibcxx_cv_stdio_seek_cur+set}" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the value of SEEK_CUR" >&5
+$as_echo_n "checking for the value of SEEK_CUR... " >&6; }
+if test "${glibcxx_cv_stdio_seek_cur+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18715,8 +18715,7 @@ fi
 
 
 fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_seek_cur" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_seek_cur" >&5
 $as_echo "$glibcxx_cv_stdio_seek_cur" >&6; }
 
 cat >>confdefs.h <<_ACEOF
@@ -18724,7 +18723,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  if test "${glibcxx_cv_stdio_seek_end+set}" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the value of SEEK_END" >&5
+$as_echo_n "checking for the value of SEEK_END... " >&6; }
+if test "${glibcxx_cv_stdio_seek_end+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -18736,8 +18737,7 @@ fi
 
 
 fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_seek_end" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_stdio_seek_end" >&5
 $as_echo "$glibcxx_cv_stdio_seek_end" >&6; }
 
 cat >>confdefs.h <<_ACEOF