From 52a57250621b05048f505946c662675d083d8335 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Fri, 18 May 2001 07:24:24 +0000
Subject: [PATCH] acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set
 glibcpp_srcdir amd glibcpp_prefixdir with absolute paths.

2001-05-18  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set glibcpp_srcdir
	amd glibcpp_prefixdir with absolute paths.

	* include/bits/c++config (__GLIBCPP__): Bump.
	* acinclude.m4 (GLIBCPP_CONFIGURE): Correct version number.

From-SVN: r42253
---
 libstdc++-v3/ChangeLog              |  8 ++++++++
 libstdc++-v3/acinclude.m4           | 10 +++++-----
 libstdc++-v3/aclocal.m4             | 10 +++++-----
 libstdc++-v3/configure              | 10 +++++-----
 libstdc++-v3/include/bits/c++config |  2 +-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d7f67943c8d..7b92359c598 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set glibcpp_srcdir
+	amd glibcpp_prefixdir with absolute paths.
+
+	* include/bits/c++config (__GLIBCPP__): Bump.
+	* acinclude.m4 (GLIBCPP_CONFIGURE): Correct version number.
+
 2001-05-18  Gabriel Dos Reis  <gdr@codesourcery.com>
 
         * include/bits/std_valarray.h (valarray<>::operator[] const):
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index d40cf1e6c14..ef3f5279cbe 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -17,7 +17,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   glibcpp_basedir=$auxdir/$1/libstdc++-v3
   AC_SUBST(glibcpp_basedir)
 
-  AM_INIT_AUTOMAKE(libstdc++, 2.91)
+  AM_INIT_AUTOMAKE(libstdc++, 2.92)
 
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
@@ -1578,10 +1578,10 @@ glibcpp_toolexecdir=no
 glibcpp_toolexeclibdir=no
 
 # Export build and source directories.
-tmp_builddir=`pwd`
-glibcpp_builddir=$tmp_builddir
-glibcpp_srcdir=${srcdir}
-glibcpp_prefixdir=${prefix}
+# These need to be absolute paths, thus the use of pwd.
+glibcpp_builddir=`pwd`
+glibcpp_srcdir=`cd ${srcdir} && pwd`
+glibcpp_prefixdir=`cd ${prefix} && pwd`
 
 AC_MSG_CHECKING([for interface version number])
 libstdcxx_interface=$INTERFACE
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 7630620e23c..d49aae775a0 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -29,7 +29,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   glibcpp_basedir=$auxdir/$1/libstdc++-v3
   AC_SUBST(glibcpp_basedir)
 
-  AM_INIT_AUTOMAKE(libstdc++, 2.91)
+  AM_INIT_AUTOMAKE(libstdc++, 2.92)
 
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
@@ -1590,10 +1590,10 @@ glibcpp_toolexecdir=no
 glibcpp_toolexeclibdir=no
 
 # Export build and source directories.
-tmp_builddir=`pwd`
-glibcpp_builddir=$tmp_builddir
-glibcpp_srcdir=${srcdir}
-glibcpp_prefixdir=${prefix}
+# These need to be absolute paths, thus the use of pwd.
+glibcpp_builddir=`pwd`
+glibcpp_srcdir=`cd ${srcdir} && pwd`
+glibcpp_prefixdir=`cd ${prefix} && pwd`
 
 AC_MSG_CHECKING([for interface version number])
 libstdcxx_interface=$INTERFACE
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 59273aebf4d..93e0d9abab1 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -959,7 +959,7 @@ fi
   
 PACKAGE=libstdc++
 
-VERSION=2.91
+VERSION=2.92
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -16498,10 +16498,10 @@ glibcpp_toolexecdir=no
 glibcpp_toolexeclibdir=no
 
 # Export build and source directories.
-tmp_builddir=`pwd`
-glibcpp_builddir=$tmp_builddir
-glibcpp_srcdir=${srcdir}
-glibcpp_prefixdir=${prefix}
+# These need to be absolute paths, thus the use of pwd.
+glibcpp_builddir=`pwd`
+glibcpp_srcdir=`cd ${srcdir} && pwd`
+glibcpp_prefixdir=`cd ${prefix} && pwd`
 
 echo $ac_n "checking for interface version number""... $ac_c" 1>&6
 echo "configure:16508: checking for interface version number" >&5
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index e1571061e72..f87f58e03fd 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -34,7 +34,7 @@
 #include <bits/os_defines.h>
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCPP__ 20010417
+#define __GLIBCPP__ 20010517
 
 // This is necessary until GCC supports separate template
 // compilation.  
-- 
2.30.2