diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-06-08 18:02:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-06-08 18:02:03 +0000 |
| commit | 7f7ba9bf903da49da760b7aa602d75de99d2056a (patch) | |
| tree | eb0b043c45a79e0b43fab9a130cc1202027e5b1d /libjava/acinclude.m4 | |
| parent | a5440f9ebf63d09b87b2adb7944c0cee52374e78 (diff) | |
| download | gcc-7f7ba9bf903da49da760b7aa602d75de99d2056a.zip gcc-7f7ba9bf903da49da760b7aa602d75de99d2056a.tar.gz gcc-7f7ba9bf903da49da760b7aa602d75de99d2056a.tar.bz2 | |
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.
From-SVN: r43034
Diffstat (limited to 'libjava/acinclude.m4')
| -rw-r--r-- | libjava/acinclude.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index f8f2423..bee5413 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 |