From: ro@138bc75d-0d04-0410-961f-82ee72b054a4 Date: Thu, 7 Aug 2003 21:34:19 +0000 (+0000) Subject: boehm-gc: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f5482891b5c1758eceb2a955e8a4d48f6bfaede;p=gc 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70233 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/ChangeLog b/ChangeLog index 7e0d9109..f1dc38fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-08-07 Rainer Orth + Roger Sayle + + * 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 * include/gc.h (GC_CreateThread): Declare with WINAPI diff --git a/configure b/configure index e8ca37d9..05905ca3 100755 --- a/configure +++ b/configure @@ -2722,7 +2722,7 @@ if test "${enable_parallel_mark+set}" = set; then fi -INCLUDES=-I${srcdir}/include +INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include" THREADLIBS= case "$THREADS" in no | none | single) @@ -3792,11 +3792,12 @@ gc_basedir=${gc_basedir} CC="${CC}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" DEFS="$DEFS" +INCLUDES="$INCLUDES" EOF cat >> $CONFIG_STATUS <<\EOF -echo "$DEFS" > boehm-cflags +echo "$INCLUDES $DEFS" > boehm-cflags if test -n "$CONFIG_FILES"; then LD="${ORIGINAL_LD_FOR_MULTILIBS}" diff --git a/configure.in b/configure.in index 99686242..637c8ad3 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,7 @@ AC_ARG_ENABLE(parallel-mark, esac] ) -INCLUDES=-I${srcdir}/include +INCLUDES="-I`cd $srcdir && ${PWDCMD-pwd}`/include" THREADLIBS= case "$THREADS" in no | none | single) @@ -436,8 +436,8 @@ else fi AC_OUTPUT(Makefile include/Makefile, [ -dnl Put all the -D options in a file. -echo "$DEFS" > boehm-cflags +dnl Put all the -I and -D options in a file. +echo "$INCLUDES $DEFS" > boehm-cflags if test -n "$CONFIG_FILES"; then LD="${ORIGINAL_LD_FOR_MULTILIBS}" @@ -453,4 +453,5 @@ gc_basedir=${gc_basedir} CC="${CC}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" DEFS="$DEFS" +INCLUDES="$INCLUDES" )