acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of glibcpp_CXX, since libjava uses even another CXX.
2002-02-26 Andreas Schwab <schwab@suse.de> * acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of glibcpp_CXX, since libjava uses even another CXX. * aclocal.m4, configure: Regenerated. From-SVN: r50084
This commit is contained in:
parent
d699058e0a
commit
7d2c4fe1e1
4 changed files with 350 additions and 355 deletions
|
@ -1,3 +1,9 @@
|
|||
2002-02-26 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of
|
||||
glibcpp_CXX, since libjava uses even another CXX.
|
||||
* aclocal.m4, configure: Regenerated.
|
||||
|
||||
2002-02-26 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* java/lang/natPosixProcess.cc (startProcess): Use FD_CLOEXEC, not
|
||||
|
|
|
@ -81,23 +81,23 @@ define([AC_PROG_CXX_WORKS],[])
|
|||
|
||||
AC_PROG_CC
|
||||
|
||||
# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, that gets
|
||||
# glibcpp_CXX cached instead of CXX. That's because we're passed a
|
||||
# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, but use
|
||||
# glibjava_CXX instead of glibcpp_CXX. That's because we're passed a
|
||||
# different definition of CXX than other directories, since we don't
|
||||
# depend on libstdc++-v3 having already been built.
|
||||
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 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
|
||||
# Use glibjava_CXX so that we do not cause CXX to be cached with the
|
||||
# flags that come in CXX while configuring libjava. They're different
|
||||
# from those used for all other target libraries. If CXX is set in
|
||||
# the environment, respect that here.
|
||||
glibcpp_CXX=$CXX
|
||||
AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
|
||||
glibjava_CXX=$CXX
|
||||
AC_CHECK_PROGS(glibjava_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
|
||||
AC_SUBST(CXX)
|
||||
CXX=$glibcpp_CXX
|
||||
test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
||||
CXX=$glibjava_CXX
|
||||
test -z "$glibjava_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
||||
|
||||
AC_PROG_CXX_GNU
|
||||
|
||||
|
|
16
libjava/aclocal.m4
vendored
16
libjava/aclocal.m4
vendored
|
@ -93,23 +93,23 @@ define([AC_PROG_CXX_WORKS],[])
|
|||
|
||||
AC_PROG_CC
|
||||
|
||||
# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, that gets
|
||||
# glibcpp_CXX cached instead of CXX. That's because we're passed a
|
||||
# We use the libstdc++-v3 version of LIB_AC_PROG_CXX, but use
|
||||
# glibjava_CXX instead of glibcpp_CXX. That's because we're passed a
|
||||
# different definition of CXX than other directories, since we don't
|
||||
# depend on libstdc++-v3 having already been built.
|
||||
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 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
|
||||
# Use glibjava_CXX so that we do not cause CXX to be cached with the
|
||||
# flags that come in CXX while configuring libjava. They're different
|
||||
# from those used for all other target libraries. If CXX is set in
|
||||
# the environment, respect that here.
|
||||
glibcpp_CXX=$CXX
|
||||
AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
|
||||
glibjava_CXX=$CXX
|
||||
AC_CHECK_PROGS(glibjava_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
|
||||
AC_SUBST(CXX)
|
||||
CXX=$glibcpp_CXX
|
||||
test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
||||
CXX=$glibjava_CXX
|
||||
test -z "$glibjava_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
||||
|
||||
AC_PROG_CXX_GNU
|
||||
|
||||
|
|
667
libjava/configure
vendored
667
libjava/configure
vendored
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue