diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-11 18:52:31 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-11 18:52:31 +0000 |
| commit | c45e0e39b0d508570d821c206a2903d8f861f6e0 (patch) | |
| tree | 26c1b4dcbc3d0ff6bd0acd4ee5ca67baf8ca33cf /libstdc++-v3/aclocal.m4 | |
| parent | 1a670edb8a4b7dd7414d0f36d13375a89ca523e7 (diff) | |
2001-04-11 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4: AC_CHECK_TOOL for expect.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.am (RUNTEST): Use substituted.
(EXPECT): Same.
* configure.in: Remove xcompiling substitution.
* tests_flags.in (CROSS_LIB_PATH): Remove.
(xcompiling): Remove.
(CXX): Use substituted CXX.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41262 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index f16196a8887..74298f6bef0 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -90,15 +90,14 @@ AC_DEFUN(LIB_AC_PROG_CXX, [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl dnl Fool anybody using AC_PROG_CXX. AC_PROVIDE([AC_PROG_CXX]) -# Use CXX_libstdcxx so that we do not cause CXX to be cached with the +# Use glibcpp_CXX so that we do not cause CXX to be cached with the # flags that come in CXX while configuring libstdc++. They're different # from those used for all other target libraries. If CXX is set in # the environment, respect that here. -CXX_libstdcxx=$CXX -AC_CHECK_PROGS(CXX_libstdcxx, $CCC c++ g++ gcc CC cxx cc++, gcc) -CXX=$CXX_libstdcxx -AC_SUBST(CXX) -test -z "$CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) +glibcpp_CXX=$CXX +AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) +AC_SUBST(glibcpp_CXX) +test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) AC_PROG_CXX_GNU @@ -128,8 +127,11 @@ LIB_AC_PROG_CXX AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AR, ar) - AC_CHECK_TOOL(RANLIB, ranlib, :) - + AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error) + AC_CHECK_TOOL(glibcpp_expect, expect, expect-not-found-in-path-error) + AC_CHECK_TOOL(glibcpp_runtest, runtest, runtest-not-found-in-path-error) + AC_SUBST(glibcpp_expect) + AC_SUBST(glibcpp_runtest) AC_PROG_INSTALL AM_MAINTAINER_MODE |