diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/acinclude.m4 | 2 | ||||
| -rw-r--r-- | libjava/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | libjava/configure | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 903ca65bc7c..04eb55c3741 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-02-22 Alexandre Oliva <aoliva@redhat.com> + + * acinclude.m4 (CXX): AC_SUBST it, instead of glibcpp_CXX. + * aclocal.m4, configure: Rebuilt. + 2002-02-20 Per Bothner <per@bothner.com> * gnu/gcj/protocol/file/Connection.java (conect): Open the input diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index 10d59d4a386..2dcf74458ce 100644 --- a/libjava/acinclude.m4 +++ b/libjava/acinclude.m4 @@ -95,7 +95,7 @@ AC_PROVIDE([AC_PROG_CXX]) # the environment, respect that here. glibcpp_CXX=$CXX AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) -AC_SUBST(glibcpp_CXX) +AC_SUBST(CXX) CXX=$glibcpp_CXX test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 6a2876c3b08..9004008dbd5 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -107,7 +107,7 @@ AC_PROVIDE([AC_PROG_CXX]) # the environment, respect that here. glibcpp_CXX=$CXX AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) -AC_SUBST(glibcpp_CXX) +AC_SUBST(CXX) CXX=$glibcpp_CXX test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) diff --git a/libjava/configure b/libjava/configure index 26dddfe7ce2..c28bb1cd2a4 100755 --- a/libjava/configure +++ b/libjava/configure @@ -7479,6 +7479,7 @@ s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g s%@CC@%$CC%g s%@glibcpp_CXX@%$glibcpp_CXX%g +s%@CXX@%$CXX%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g |
