diff options
| author | Anthony Green <green@redhat.com> | 2000-03-04 21:50:19 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2000-03-04 21:50:19 +0000 |
| commit | 0f9c645ea579c48499360de5b2bd4c8cd281c767 (patch) | |
| tree | 901f63b43d53a19c6073d00835350c162cba703c /libjava/configure.in | |
| parent | 49e6c08e21b3138382ca5eaca0c757930eea4b60 (diff) | |
| download | gcc-0f9c645ea579c48499360de5b2bd4c8cd281c767.zip gcc-0f9c645ea579c48499360de5b2bd4c8cd281c767.tar.gz gcc-0f9c645ea579c48499360de5b2bd4c8cd281c767.tar.bz2 | |
configure: Rebuilt.
* configure: Rebuilt.
* configure.in (ZLIBTESTSPEC): New macro.
(GCTESTSPEC): New macro.
(LIBGCJTESTSPEC): New macro.
* libgcj-test.spec.in: New file.
From-SVN: r32330
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libjava/configure.in b/libjava/configure.in index fb52c43..6b8d58b 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -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], |