From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 6 Apr 2010 01:27:44 +0000 (+0000)
Subject: 2010-04-06  Matthias Klose  <doko@ubuntu.com>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=ad7af939311e5483aaa7f01a617069119b995cd2

2010-04-06  Matthias Klose  <doko@ubuntu.com>

        * acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Show test result.
        * configure: Regenerate.
        * doc/xml/manual/configure.xml, doc/html/manual/configure.html:
        Document --enable-libstdcxx-time as the short form for
        --enable-libstdcxx-time=yes.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157975 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dba4af68492..a5f2cafdc3e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-06  Matthias Klose  <doko@ubuntu.com>
+
+	* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Show test result.
+	* configure: Regenerate.
+	* doc/xml/manual/configure.xml, doc/html/manual/configure.html:
+	Document --enable-libstdcxx-time as the short form for
+	--enable-libstdcxx-time=yes.
+
 2010-04-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/basic_string.h: Fix pasto in comment.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 94b53b89e77..f54517f200a 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1075,8 +1075,9 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
   CXXFLAGS="$CXXFLAGS -fno-exceptions"
   ac_save_LIBS="$LIBS"
 
-  ac_has_clock_monotonic=no;
-  ac_has_clock_realtime=no;
+  ac_has_clock_monotonic=no
+  ac_has_clock_realtime=no
+  AC_MSG_RESULT($enable_libstdcxx_time)
 
   if test x"$enable_libstdcxx_time" != x"no"; then
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ed611d66d12..dc77c0d7c1f 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -18860,8 +18860,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   CXXFLAGS="$CXXFLAGS -fno-exceptions"
   ac_save_LIBS="$LIBS"
 
-  ac_has_clock_monotonic=no;
-  ac_has_clock_realtime=no;
+  ac_has_clock_monotonic=no
+  ac_has_clock_realtime=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libstdcxx_time" >&5
+$as_echo "$enable_libstdcxx_time" >&6; }
 
   if test x"$enable_libstdcxx_time" != x"no"; then
 
diff --git a/libstdc++-v3/doc/html/manual/configure.html b/libstdc++-v3/doc/html/manual/configure.html
index d7cde522e82..c5ee8c3b546 100644
--- a/libstdc++-v3/doc/html/manual/configure.html
+++ b/libstdc++-v3/doc/html/manual/configure.html
@@ -187,8 +187,8 @@
      <span class="emphasis"><em>freestanding</em></span> environment, in which only a
      minimal set of headers are provided.  This option builds such an
      environment.
-     </p></dd><dt><span class="term"><code class="code">--enable-clock-gettime</code></span></dt><dd><p>This is an abbreviated form of
-        <code class="code">'--enable-clock-gettime=yes'</code>(described next).
+     </p></dd><dt><span class="term"><code class="code">--enable-libstdcxx-time</code></span></dt><dd><p>This is an abbreviated form of
+        <code class="code">'--enable-libstdcxx-time=yes'</code>(described next).
      </p></dd><dt><span class="term"><code class="code">--enable-libstdcxx-time=OPTION</code></span></dt><dd><p>Enables link-type checks for the availability of the
         clock_gettime clocks, used in the implementation of [time.clock],
         and of the nanosleep and sched_yield functions, used in the
diff --git a/libstdc++-v3/doc/xml/manual/configure.xml b/libstdc++-v3/doc/xml/manual/configure.xml
index 26d7d51c2c1..8cca56cd828 100644
--- a/libstdc++-v3/doc/xml/manual/configure.xml
+++ b/libstdc++-v3/doc/xml/manual/configure.xml
@@ -324,9 +324,9 @@
      </para>
  </listitem></varlistentry>
 
- <varlistentry><term><code>--enable-clock-gettime</code></term>
+ <varlistentry><term><code>--enable-libstdcxx-time</code></term>
  <listitem><para>This is an abbreviated form of
-	<code>'--enable-clock-gettime=yes'</code>(described next).
+	<code>'--enable-libstdcxx-time=yes'</code>(described next).
      </para>
  </listitem></varlistentry>