configure.in (auxdir): Replace by ...

	* configure.in (auxdir): Replace by ...
	(toprel): ... new variable.
	(toplevel_srcdir): Construct from $toprel.
	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Use $toprel
	rather than .. to locate gcc source directory.
	(GLIBCPP_CONFIGURE): Replace $auxdir with $srcdir/$toprel.
	* aclocal.m4, configure: Rebuilt.

From-SVN: r43364

libstdc++-v3/ChangeLog

+2001-06-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* configure.in (auxdir): Replace by ...
+	(toprel): ... new variable.
+	(toplevel_srcdir): Construct from $toprel.
+	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Use $toprel
+	rather than .. to locate gcc source directory.
+	(GLIBCPP_CONFIGURE): Replace $auxdir with $srcdir/$toprel.
+	* aclocal.m4, configure: Rebuilt.
+
 2001-06-13  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	(Approved by Mark and Benjamin.  Applied by Loren.)

libstdc++-v3/acinclude.m4

@@ -12,7 +12,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
     *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
    esac], [multilib=yes])dnl
 
-  glibcpp_basedir=$auxdir/$1/libstdc++-v3
+  glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
   AC_SUBST(glibcpp_basedir)
 
   AM_INIT_AUTOMAKE(libstdc++, 3.0.0)
@@ -1144,9 +1144,10 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
   target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
   AC_MSG_RESULT([$target_thread_file])
 
-  AC_LINK_FILES(../gcc/gthr.h, include/bits/gthr.h-in)
-  AC_LINK_FILES(../gcc/gthr-single.h, include/bits/gthr-single.h-in)
-  AC_LINK_FILES(../gcc/gthr-$target_thread_file.h,
+  AC_LINK_FILES($toprel/gcc/gthr.h, include/bits/gthr.h-in)
+  AC_LINK_FILES($toprel/gcc/gthr-single.h,
+		include/bits/gthr-single.h-in)
+  AC_LINK_FILES($toprel/gcc/gthr-$target_thread_file.h,
 		include/bits/gthr-default.h-in)
   if test $target_thread_file != single; then
     AC_DEFINE(HAVE_GTHR_DEFAULT)

libstdc++-v3/aclocal.m4

@@ -24,7 +24,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
     *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
    esac], [multilib=yes])dnl
 
-  glibcpp_basedir=$auxdir/$1/libstdc++-v3
+  glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
   AC_SUBST(glibcpp_basedir)
 
   AM_INIT_AUTOMAKE(libstdc++, 3.0.0)
@@ -1156,9 +1156,10 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
   target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
   AC_MSG_RESULT([$target_thread_file])
 
-  AC_LINK_FILES(../gcc/gthr.h, include/bits/gthr.h-in)
-  AC_LINK_FILES(../gcc/gthr-single.h, include/bits/gthr-single.h-in)
-  AC_LINK_FILES(../gcc/gthr-$target_thread_file.h,
+  AC_LINK_FILES($toprel/gcc/gthr.h, include/bits/gthr.h-in)
+  AC_LINK_FILES($toprel/gcc/gthr-single.h,
+		include/bits/gthr-single.h-in)
+  AC_LINK_FILES($toprel/gcc/gthr-$target_thread_file.h,
 		include/bits/gthr-default.h-in)
   if test $target_thread_file != single; then
     AC_DEFINE(HAVE_GTHR_DEFAULT)

libstdc++-v3/configure.in

@@ -11,22 +11,19 @@ AC_INIT(src/ios.cc)
 # source directory.
 if test "${srcdir}" = "."; then
   if test -z "${with_target_subdir}"; then
-    toplevel_srcdir="\${top_srcdir}/.."
-    auxdir="${srcdir}/.."
+    toprel=".."
   else
     if test "${with_target_subdir}" != "."; then
-      toplevel_srcdir="\${top_srcdir}/${with_multisrctop}../.."
-      auxdir="${srcdir}/${with_multisrctop}../.."
+      toprel="${with_multisrctop}../.."
     else
-      toplevel_srcdir="\${top_srcdir}/${with_multisrctop}.."
-      auxdir="${srcdir}/${with_multisrctop}.."
+      toprel="${with_multisrctop}.."
     fi
   fi
 else
-  toplevel_srcdir="\${top_srcdir}/.."
-  auxdir="${srcdir}/.."
+  toprel=".."
 fi
-AC_CONFIG_AUX_DIR($auxdir)
+AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
+toplevel_srcdir=\${top_srcdir}/$toprel
 AC_SUBST(toplevel_srcdir)
 
 dnl This is here just to satisfy automake.