diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-14 08:45:38 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-14 08:45:38 +0000 |
| commit | c3f3e8918fd3633fa2b5bf0dc6437540b6bbae73 (patch) | |
| tree | 5f8eeae9eb41cceaa07e9ebe843f20c446c84e79 /libstdc++-v3/aclocal.m4 | |
| parent | 7f18f5fbe65dade6394e4d7de8bd01de0218cb00 (diff) | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43364 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 53fd6f4777e..197c82957c8 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/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) |