This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch: fix for in-tree builds, aka PR bootstrap/3075


I'm checking this in on the branch.  I'm also putting a slightly
different version of it on the trunk.

This fixes in-tree java-enabled builds -- PR bootstrap/3075.

I tested it by doing an in-tree and out-of-tree build on x86.

If you find problems with it please send email and I will fix them
asap.

Tom

Index: boehm-gc/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/ChangeLog,v
retrieving revision 1.66.4.7
diff -u -r1.66.4.7 ChangeLog
--- ChangeLog	2001/05/01 21:41:46	1.66.4.7
+++ ChangeLog	2001/06/08 17:56:17
@@ -1,3 +1,14 @@
+2001-06-07  Tom Tromey  <tromey@redhat.com>
+
+	For PR bootstrap/3075:
+	* configure, aclocal.m4, Makefile.in: Rebuilt.
+	* configure.in: Don't call AC_CONFIG_AUX_DIR or
+	AC_CANONICAL_SYSTEM.
+	* acinclude.m4 (BOEHM_CONFIGURE): Call AC_CONFIG_AUX_DIR and
+	AC_CANONICAL_SYSTEM here.
+	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
+	boehm_gc_basedir.
+
 2001-05-01  Jeffrey Oldham  <oldham@codesourcery.com>
 
 	* gc_priv.h (UNLOCK): Change type of GC_noop1 argument.
Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.21.4.1
diff -u -r1.21.4.1 configure.in
--- configure.in	2001/04/26 04:33:06	1.21.4.1
+++ configure.in	2001/06/08 17:56:18
@@ -2,11 +2,6 @@
 
 AC_INIT(gc_mark.h)
 
-dnl Can't be done in BOEHM_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(..)
-
-AC_CANONICAL_SYSTEM
-
 BOEHM_CONFIGURE(.)
 
 AM_PROG_LIBTOOL
Index: boehm-gc/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v
retrieving revision 1.18.4.3
diff -u -r1.18.4.3 Makefile.am
--- Makefile.am	2001/03/22 19:02:39	1.18.4.3
+++ Makefile.am	2001/06/08 17:56:18
@@ -113,7 +113,7 @@
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
-CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
Index: boehm-gc/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/acinclude.m4,v
retrieving revision 1.10
diff -u -r1.10 acinclude.m4
--- acinclude.m4	2000/09/10 07:41:00	1.10
+++ acinclude.m4	2001/06/08 17:56:18
@@ -28,8 +28,14 @@
   boehm_gc_basedir="[$]{srcdir}/$1"
 fi
 AC_SUBST(boehm_gc_basedir)
+AC_CONFIG_AUX_DIR($boehm_gc_basedir/..)
+if :; then :; else
+  # This overrides the previous occurrence for automake, but not for
+  # autoconf, which is exactly what we want.
+  AC_CONFIG_AUX_DIR(..)
+fi
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(boehm-gc, 5.1, no-define)
 
Index: libjava/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.674.2.80
diff -u -r1.674.2.80 ChangeLog
--- ChangeLog	2001/06/05 09:56:06	1.674.2.80
+++ ChangeLog	2001/06/08 17:56:23
@@ -1,3 +1,16 @@
+2001-06-07  Tom Tromey  <tromey@redhat.com>
+
+	For PR bootstrap/3075:
+	* configure, aclocal.m4, Makefile.am: Rebuilt.
+	* configure.in: Pass `--with-auxdir' to subdir configure.  Don't
+	call AC_CONFIG_AUX_DIR or AC_CANONICAL_SYSTEM.  Look for unwind.h
+	relative to libgcj_basedir.
+	* acinclude.m4 ((LIBGCJ_CONFIGURE): Call AC_CONFIG_AUX_DIR and
+	AC_CANONICAL_SYSTEM here.
+	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
+	libgcj_basedir.
+	($(extra_headers)): New target.
+
 2001-05-31  Martin Kahlert  <martin.kahlert@infineon.com>
 	    Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.73.2.10
diff -u -r1.73.2.10 configure.in
--- configure.in	2001/05/29 16:28:14	1.73.2.10
+++ configure.in	2001/06/08 17:56:24
@@ -1,10 +1,6 @@
 dnl Process this with autoconf to create configure
 AC_INIT(java/lang/System.java)
 
-dnl Can't be done in LIBGCJ_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(..)
-
-AC_CANONICAL_SYSTEM
 AC_PROG_LN_S
 
 dnl We use these options to decide which functions to include.
@@ -26,6 +22,8 @@
    AC_DEFINE(USE_LTDL)
    # Sigh.  Libtool's macro doesn't do the right thing.
    INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
+   # FIXME: this is a hack.
+   ac_configure_args="$ac_configure_args --with-auxdir=../$ac_aux_dir"
 fi
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
@@ -350,8 +348,8 @@
 # gcc, then look there.  Otherwise look in compat-include.  If all else
 # fails, just hope the user has set things up somehow.
 echo "probing $srcdir/../gcc/unwind.h"
-if test -r $srcdir/../gcc/unwind.h; then
-   GCC_UNWIND_INCLUDE='-I$(top_srcdir)/../gcc'
+if test -r $libgcj_basedir/../gcc/unwind.h; then
+   GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
 else
    if test -d $srcdir/../compat-include; then
       GCC_UNWIND_INCLUDE='-I$(top_srcdir)/../compat-include'
@@ -827,7 +825,7 @@
 changequote(<<,>>)
 	 d=`echo $f | sed -e 's,/[^/]*$,,'`
 changequote([,])
-	 $srcdir/../mkinstalldirs $d
+	 $libgcj_basedir/../mkinstalldirs $d
 	 echo > $f
       }
    done
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.129.2.12
diff -u -r1.129.2.12 Makefile.am
--- Makefile.am	2001/05/30 14:07:08	1.129.2.12
+++ Makefile.am	2001/06/08 17:56:26
@@ -358,6 +358,9 @@
 ## Headers we maintain by hand and which we want to install.
 extra_headers = java/lang/Object.h java/lang/Class.h
 
+$(extra_headers):
+	@:
+
 ## Install the headers.  It is fairly ugly that we have to do this by
 ## hand.
 install-data-local:
@@ -1432,7 +1435,7 @@
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
-CONFIG_STATUS_DEPENDENCIES = $(libgcj_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
 MAKEOVERRIDES=
 
Index: libjava/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libjava/acinclude.m4,v
retrieving revision 1.7
diff -u -r1.7 acinclude.m4
--- acinclude.m4	2000/09/13 19:01:20	1.7
+++ acinclude.m4	2001/06/08 17:56:26
@@ -22,8 +22,14 @@
   libgcj_basedir="[$]{srcdir}/$1"
 fi
 AC_SUBST(libgcj_basedir)
+AC_CONFIG_AUX_DIR($libgcj_basedir/..)
+if :; then :; else
+  # This overrides the previous occurrence for automake, but not for
+  # autoconf, which is exactly what we want.
+  AC_CONFIG_AUX_DIR(..)
+fi
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
 dnl This shouldn't be needed, as long as top-level dependencies are
 dnl defined correctly and shared-library paths are set up so that


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]