summaryrefslogtreecommitdiff
path: root/libjava/configure.ac
diff options
context:
space:
mode:
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2004-12-02 11:05:13 +0000
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2004-12-02 11:05:13 +0000
commit14ac914460d95cc284b41bd11403d1ef2f7f5bf5 (patch)
tree474f34608ab902f9ddc5b7629c88676c03a26731 /libjava/configure.ac
parentfcb13283797f0f8a65311110397396613ab9a93b (diff)
downloadgcc-14ac914460d95cc284b41bd11403d1ef2f7f5bf5.tar.gz
Introduce and use config/gcc-version.m4.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91625 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
-rw-r--r--libjava/configure.ac6
1 files changed, 2 insertions, 4 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 43156b7f68d..61474b25a8d 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -730,13 +730,11 @@ AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
# We're in the tree with gcc, and need to include some of its headers.
GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
+TL_AC_GCC_VERSION([$srcdir/..])
+
# Figure out where generated headers like libgcj-config.h get installed.
-gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
-gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^\"]]*\)\".*/\1/'`
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([[^ ]]*\) .*/\1/'`
tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
AC_SUBST(tool_include_dir)
-AC_SUBST(gcc_version)
if test "x${with_newlib}" = "xyes"; then
# We are being configured with a cross compiler. AC_REPLACE_FUNCS