diff options
Diffstat (limited to 'libjava/aclocal.m4')
| -rw-r--r-- | libjava/aclocal.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index a99cac3318e..d132b6b947e 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -34,8 +34,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 @@ -85,7 +91,7 @@ libgcj_cflags= libgcj_cxxflags= libgcj_javaflags= -. [$]{libgcj_basedir}/configure.host +. [$]{srcdir}/configure.host case [$]{libgcj_basedir} in /* | [A-Za-z]:[/\\]*) libgcj_flagbasedir=[$]{libgcj_basedir} ;; |