Commit 7160c99d by Rainer Orth Committed by Rainer Orth

configure.in: Set INCLUDES to absolute path.

	boehm-gc:
	* configure.in: Set INCLUDES to absolute path.
	Save $INCLUDES in boehm-cflags, too.
	Set INCLUDES so it's available to config.status.
	* configure: Regenerate.

	libjava:
	* configure.in: Don't initialize GCINCS to boehm-gc/include.
	* configure: Regenerate.

	libjava/libltdl:
	* configure.in: Don't initialize GCINCS to boehm-gc/include.
	* Regenerate.

Co-Authored-By: Roger Sayle <roger@eyesopen.com>

From-SVN: r70233
parent 1c64ab61
2003-08-07 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Roger Sayle <roger@eyesopen.com>
* configure.in: Set INCLUDES to absolute path.
Save $INCLUDES in boehm-cflags, too.
Set INCLUDES so it's available to config.status.
* configure: Regenerate.
2003-07-31 Danny Smith <dannysmith@users.sourceforge.net> 2003-07-31 Danny Smith <dannysmith@users.sourceforge.net>
* include/gc.h (GC_CreateThread): Declare with WINAPI * include/gc.h (GC_CreateThread): Declare with WINAPI
......
...@@ -2722,7 +2722,7 @@ if test "${enable_parallel_mark+set}" = set; then ...@@ -2722,7 +2722,7 @@ if test "${enable_parallel_mark+set}" = set; then
fi fi
INCLUDES=-I${srcdir}/include INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
THREADLIBS= THREADLIBS=
case "$THREADS" in case "$THREADS" in
no | none | single) no | none | single)
...@@ -3792,11 +3792,12 @@ gc_basedir=${gc_basedir} ...@@ -3792,11 +3792,12 @@ gc_basedir=${gc_basedir}
CC="${CC}" CC="${CC}"
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
DEFS="$DEFS" DEFS="$DEFS"
INCLUDES="$INCLUDES"
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
echo "$DEFS" > boehm-cflags echo "$INCLUDES $DEFS" > boehm-cflags
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}" LD="${ORIGINAL_LD_FOR_MULTILIBS}"
......
...@@ -63,7 +63,7 @@ AC_ARG_ENABLE(parallel-mark, ...@@ -63,7 +63,7 @@ AC_ARG_ENABLE(parallel-mark,
esac] esac]
) )
INCLUDES=-I${srcdir}/include INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
THREADLIBS= THREADLIBS=
case "$THREADS" in case "$THREADS" in
no | none | single) no | none | single)
...@@ -436,8 +436,8 @@ else ...@@ -436,8 +436,8 @@ else
fi fi
AC_OUTPUT(Makefile include/Makefile, [ AC_OUTPUT(Makefile include/Makefile, [
dnl Put all the -D options in a file. dnl Put all the -I and -D options in a file.
echo "$DEFS" > boehm-cflags echo "$INCLUDES $DEFS" > boehm-cflags
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}" LD="${ORIGINAL_LD_FOR_MULTILIBS}"
...@@ -453,4 +453,5 @@ gc_basedir=${gc_basedir} ...@@ -453,4 +453,5 @@ gc_basedir=${gc_basedir}
CC="${CC}" CC="${CC}"
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
DEFS="$DEFS" DEFS="$DEFS"
INCLUDES="$INCLUDES"
) )
2003-08-07 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Don't initialize GCINCS to boehm-gc/include.
* configure: Regenerate.
2003-08-07 Bryce McKinlay <bryce@mckinlay.net.nz> 2003-08-07 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/net/Socket.java (Socket (SocketImpl)): Don't allow null * java/net/Socket.java (Socket (SocketImpl)): Don't allow null
......
...@@ -375,13 +375,12 @@ case "$GC" in ...@@ -375,13 +375,12 @@ case "$GC" in
boehm) boehm)
AC_MSG_RESULT(boehm) AC_MSG_RESULT(boehm)
GCLIBS=../boehm-gc/libgcjgc_convenience.la GCLIBS=../boehm-gc/libgcjgc_convenience.la
GCINCS='-I$(top_srcdir)/../boehm-gc/include'
JC1GCSPEC='-fuse-boehm-gc' JC1GCSPEC='-fuse-boehm-gc'
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
dnl We also want to pick up some cpp flags required when including dnl We also want to pick up some cpp flags required when including
dnl boehm-config.h. Yuck. dnl boehm-config.h. Yuck.
GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" GCINCS="`cat ../boehm-gc/boehm-cflags`"
GCOBJS=boehm.lo GCOBJS=boehm.lo
GCHDR=boehm-gc.h GCHDR=boehm-gc.h
dnl The POSIX thread support needs to know this. dnl The POSIX thread support needs to know this.
......
2003-08-07 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Don't initialize GCINCS to boehm-gc/include.
* Regenerate.
2002-04-28 Mark Mitchell <mark@codesourcery.com> 2002-04-28 Mark Mitchell <mark@codesourcery.com>
* .cvsignore: Remove files that are present in CVS. * .cvsignore: Remove files that are present in CVS.
......
...@@ -47,8 +47,7 @@ changequote([,]) ...@@ -47,8 +47,7 @@ changequote([,])
GCINCS= GCINCS=
if test "$GC" = "boehm"; then if test "$GC" = "boehm"; then
GCINCS='-I$(top_srcdir)/../../boehm-gc/include' GCINCS="`cat ../../boehm-gc/boehm-cflags`"
GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
AC_DEFINE(HAVE_BOEHM_GC) AC_DEFINE(HAVE_BOEHM_GC)
fi fi
AC_SUBST(GCINCS) AC_SUBST(GCINCS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment