summaryrefslogtreecommitdiff
path: root/libjava/acinclude.m4
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/acinclude.m4')
-rw-r--r--libjava/acinclude.m48
1 files changed, 7 insertions, 1 deletions
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