From 66a2e6b72d92c2a3d5e2f224e78352e70ae2d836 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 8 Jun 2001 18:02:03 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43034 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/acinclude.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libjava/acinclude.m4') diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index f8f2423f5eb..bee54131364 100644 --- a/libjava/acinclude.m4 +++ b/libjava/acinclude.m4 @@ -22,8 +22,14 @@ else 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 -- cgit v1.2.3