acinclude.m4 (CXX): AC_SUBST it, instead of glibcpp_CXX.

* acinclude.m4 (CXX): AC_SUBST it, instead of glibcpp_CXX.
* aclocal.m4, configure: Rebuilt.

From-SVN: r49974

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 903ca65bc7c60de16e2e45c1ede2458dad400cdb..04eb55c37414961cb3af9fd618f3e66ad6cafe40 100644 (file)
--- 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 10d59d4a38625c7420f3739977196ae50037c6f3..2dcf74458ce020798fcdea24c2ed3d70bb9b9701 100644 (file)
--- 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 6a2876c3b083ad04de61bf55858c9e41620f3ed2..9004008dbd5cdc03ac287855d28a441d403d3ace 100644 (file)
--- 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 26dddfe7ce239be07f7175733346b147579462c4..c28bb1cd2a4267d1208c01cf264829dd4010cb10 100755 (executable)
--- 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