diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-07 21:34:19 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-07 21:34:19 +0000 |
| commit | 0c429f8e928dcbd8d3dad7acdb3446c181ba0cb8 (patch) | |
| tree | 808acc504b4e4afb61c57585959d934cbf7d7394 /boehm-gc | |
| parent | 0fc672d12056e1f917bddf92f126ec0a41aff909 (diff) | |
| download | gcc-0c429f8e928dcbd8d3dad7acdb3446c181ba0cb8.tar.gz | |
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
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 8 | ||||
| -rwxr-xr-x | boehm-gc/configure | 5 | ||||
| -rw-r--r-- | boehm-gc/configure.in | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 7e0d9109829..f1dc38fe10f 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,11 @@ +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> * include/gc.h (GC_CreateThread): Declare with WINAPI diff --git a/boehm-gc/configure b/boehm-gc/configure index e8ca37d9e8a..05905ca3557 100755 --- a/boehm-gc/configure +++ b/boehm-gc/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/boehm-gc/configure.in b/boehm-gc/configure.in index 99686242214..637c8ad35fd 100644 --- a/boehm-gc/configure.in +++ b/boehm-gc/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" ) |