Re: 3.4 PATCH: Fix libltdl compilation failure on Tru64 UNIX

[Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>]

Tom Tromey writes:

> Rainer> -    GCINCS='-I$(top_srcdir)/../boehm-gc/include'
> 
> I'm not so sure about this part of the patch.
> 
> Did you configure with an absolute srcdir or a relative one?  If
> relative, does the absolute srcdir somehow end up in the boehm-cflags
> file?  If absolute, could you try the relative case?

You were right to be cautious: this part was broken for the relative case:
INCLUDES was set to (e.g.) ../../../gcc-dist/boehm-gc/include, but
libjava/libltdl is one level deeper and thus couldn't find gc.h ;-(  I've
updated the patch to produce absolute paths for INCLUDES instead, and that
one survived a bootstrap on alpha-dec-osf4.0f (with absolute srcdir) and
alpha-dec-osf5.1 (with relative srcdir).

> That's the only potential problem I could see.  If there are no
> problems here, then the patch is fine.  Please send a copy to Hans for
> possible inclusion upstream.

He won't be interested, since that boehm-cflags hack isn't in gc6.3alpha1 :-)

Is the updated patch ok for mainline now?

	Rainer

-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University


Thu Jul 31 22:39:29 2003  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
			  Roger Sayle <roger@eyesopen.com>

	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.	
	
Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.48
diff -u -p -r1.48 configure.in
--- boehm-gc/configure.in	28 Jul 2003 04:18:20 -0000	1.48
+++ boehm-gc/configure.in	6 Aug 2003 19:11:18 -0000
@@ -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"
 )
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.165
diff -u -p -r1.165 configure.in
--- libjava/configure.in	6 Aug 2003 02:49:45 -0000	1.165
+++ libjava/configure.in	6 Aug 2003 19:11:31 -0000
@@ -375,13 +375,12 @@ case "$GC" in
  boehm)
     AC_MSG_RESULT(boehm)
     GCLIBS=../boehm-gc/libgcjgc_convenience.la
-    GCINCS='-I$(top_srcdir)/../boehm-gc/include'
     JC1GCSPEC='-fuse-boehm-gc'
     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 boehm-config.h.  Yuck.
-    GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
+    GCINCS="`cat ../boehm-gc/boehm-cflags`"
     GCOBJS=boehm.lo
     GCHDR=boehm-gc.h
     dnl The POSIX thread support needs to know this.
Index: libjava/libltdl/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/libltdl/configure.in,v
retrieving revision 1.5
diff -u -p -r1.5 configure.in
--- libjava/libltdl/configure.in	3 Jul 2001 22:33:24 -0000	1.5
+++ libjava/libltdl/configure.in	6 Aug 2003 19:11:36 -0000
@@ -47,8 +47,7 @@ changequote([,])
 
 GCINCS=
 if test "$GC" = "boehm"; then
-   GCINCS='-I$(top_srcdir)/../../boehm-gc/include'
-   GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
+   GCINCS="`cat ../../boehm-gc/boehm-cflags`"
    AC_DEFINE(HAVE_BOEHM_GC)
 fi
 AC_SUBST(GCINCS)