aboutsummaryrefslogtreecommitdiff
path: root/libjava/aclocal.m4
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-18 10:28:53 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-18 10:28:53 +0000
commit6a88da5180a2ade6788bf52bbd631528c9d52b71 (patch)
tree53b9f41975e0e2efe7840dd73c924b249e441134 /libjava/aclocal.m4
parentf6d714a315209c1181abe7f1fc064a8b12456069 (diff)
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457 * configure.ac: Include override.m4. * configure: Regenerate. libgomp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libdecnumber: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. gcc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libstdc++-v3: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libobjc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. intl: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libgfortran: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libmudflap: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. boehm-gc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libiberty: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Add override.m4. * configure: Regenerate. libffi: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libssp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. config: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * confsubdir.m4: Rename to... * override.m4: ... this. Make sure aclocal always picks it. Add more lenient precious variable check, backported from autoconf trunk. libjava/libltdl: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libjava/classpath: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libjava: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libcpp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. fixincludes: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * Makefile.in: Rewrite aclocal.m4 rule. * aclocal.m4: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134434 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/aclocal.m4')
-rw-r--r--libjava/aclocal.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4
index 1e9f5b5667a..5369251bd99 100644
--- a/libjava/aclocal.m4
+++ b/libjava/aclocal.m4
@@ -350,7 +350,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# with or without modifications, as long as this notice is preserved.
AC_DEFUN([AM_PROG_GCJ],[
-AC_CHECK_PROGS(GCJ, gcj, gcj)
+AC_CHECK_PROGS(GCJ, [gcj gcj-3.2 gcj-3.1 gcj-3.0 gcj-2.95], gcj)
test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
if test "x${GCJFLAGS-unset}" = xunset; then
GCJFLAGS="-g -O2"
@@ -905,7 +905,6 @@ AC_SUBST([am__untar])
m4_include([libltdl/acinclude.m4])
m4_include([../config/acx.m4])
-m4_include([../config/confsubdir.m4])
m4_include([../config/depstand.m4])
m4_include([../config/enable.m4])
m4_include([../config/gxx-include-dir.m4])
@@ -918,6 +917,7 @@ m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4])
m4_include([../config/multi.m4])
m4_include([../config/no-executables.m4])
+m4_include([../config/override.m4])
m4_include([../config/proginstall.m4])
m4_include([../config/tls.m4])
m4_include([../config/unwind_ipinfo.m4])