re PR libgcj/20750 (libgcj needs a --with-java-home configure option)

[gcc.git] / libjava / external / Makefile.in

diff --git a/libjava/external/Makefile.in b/libjava/external/Makefile.in
index a35f042c09835ea0c2bd9675f6627310b595e328..560b0f4bb7fd3e653cf9c38020864c9900fef447 100644 (file)
--- a/libjava/external/Makefile.in
+++ b/libjava/external/Makefile.in
@@ -41,7 +41,6 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
        $(top_srcdir)/../config/acx.m4 \
-       $(top_srcdir)/../config/gcc-version.m4 \
        $(top_srcdir)/../config/gxx-include-dir.m4 \
        $(top_srcdir)/../config/iconv.m4 \
        $(top_srcdir)/../config/lcmessage.m4 \
@@ -87,7 +86,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHECKREFSPEC = @CHECKREFSPEC@
 CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
-COMPPATH = @COMPPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -132,6 +130,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTERPRETER = @INTERPRETER@
+JAVA_HOME = @JAVA_HOME@
+JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@
+JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
 JC1GCSPEC = @JC1GCSPEC@
 LDFLAGS = @LDFLAGS@
 LIBART_CFLAGS = @LIBART_CFLAGS@
@@ -248,18 +249,17 @@ build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
+build_subdir = @build_subdir@
 build_vendor = @build_vendor@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
-gcc_version = @gcc_version@
-gcc_version_full = @gcc_version_full@
-gcc_version_trigger = @gcc_version_trigger@
 gxx_include_dir = @gxx_include_dir@
 here = @here@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
+host_subdir = @host_subdir@
 host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
@@ -284,11 +284,14 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_noncanonical = @target_noncanonical@
 target_os = @target_os@
+target_subdir = @target_subdir@
 target_vendor = @target_vendor@
-tool_include_dir = @tool_include_dir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 toolexecmainlibdir = @toolexecmainlibdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 SUBDIRS = sax w3c_dom
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS