mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 22:51:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: Rebuilt.

Browse Source 
* configure: Rebuilt.
	      * configure.in (ZLIBTESTSPEC): New macro.
	      (GCTESTSPEC): New macro.
        (LIBGCJTESTSPEC): New macro.
        * libgcj-test.spec.in: New file.

From-SVN: r32330
This commit is contained in:
Anthony Green 2000-03-04 21:50:19 +00:00 committed by Anthony Green
parent 49e6c08e21
commit 0f9c645ea5
4 changed files with 187 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2000-03-04 Anthony Green <green@redhat.com>
* configure: Rebuilt.
* configure.in (ZLIBTESTSPEC): New macro.
(GCTESTSPEC): New macro.
(LIBGCJTESTSPEC): New macro.
* libgcj-test.spec.in: New file.
2000-03-02 Tom Tromey <tromey@cygnus.com>
* include/java-interp.h: Don't include MethodInvocation.h.

309
libjava/configure vendored
View File

File diff suppressed because it is too large Load Diff

12
libjava/configure.in
View File

@ -174,10 +174,15 @@ AC_LINK_FILES(java/lang/nat${PROCESS}Process.cc, java/lang/natConcreteProcess.cc
SYSTEMSPEC=
AC_SUBST(SYSTEMSPEC)
LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
AC_SUBST(LIBGCJTESTSPEC)
AC_ARG_WITH(system-zlib,
[ --with-system-zlib use installed libz])
ZLIBSPEC=
AC_SUBST(ZLIBSPEC)
ZLIBTESTSPEC=
AC_SUBST(ZLIBTESTSPEC)
dnl FIXME: this should be _libs on some hosts.
libsubdir=.libs
@ -195,6 +200,7 @@ GCINCS=
GCDEPS=
GCOBJS=
GCSPEC=
GCTESTSPEC=
case "$GC" in
boehm)
AC_MSG_RESULT(boehm)
@ -204,6 +210,7 @@ case "$GC" in
GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
GCSPEC='-lgcjgc'
GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
dnl We also want to pick up some cpp flags required when including
dnl boehm-config.h. Yuck.
GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
@ -226,6 +233,7 @@ AC_SUBST(GCINCS)
AC_SUBST(GCDEPS)
AC_SUBST(GCOBJS)
AC_SUBST(GCSPEC)
AC_SUBST(GCTESTSPEC)
AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
@ -358,6 +366,7 @@ if test -n "${with_cross_host}"; then
AC_DEFINE(NO_GETUID)
ZLIBSPEC=-lzgcj
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
# If Canadian cross, then don't pick up tools from the build
# directory.
@ -546,6 +555,7 @@ else
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
else
ZLIBSPEC=-lzgcj
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
fi
# On Solaris, and maybe other architectures, the Boehm collector
@ -720,7 +730,7 @@ fi
here=`pwd`
AC_SUBST(here)
AC_OUTPUT(Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile,
AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
fi],

7
libjava/libgcj-test.spec.in Normal file
View File

@ -0,0 +1,7 @@
#
# This spec file is read by gcj when linking.
# It is only used by the testing harnesses (in libjava and gdb).
#
%rename lib liborig2
*lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2)