aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure.ac
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2007-09-04 21:32:41 +0000
committerMatthias Klose <doko@gcc.gnu.org>2007-09-04 21:32:41 +0000
commitacd29efb0f17f0ec7e2452b7440dd3fd666b6ce2 (patch)
tree19ddc8657854302aec5920b81a154d6b8cc5ba2b /libjava/configure.ac
parentb2e34bc12529ed3d3c046d3b1cd66687901a6ff8 (diff)
downloadgcc-acd29efb0f17f0ec7e2452b7440dd3fd666b6ce2.zip
gcc-acd29efb0f17f0ec7e2452b7440dd3fd666b6ce2.tar.gz
gcc-acd29efb0f17f0ec7e2452b7440dd3fd666b6ce2.tar.bz2
re PR libgcj/33278 (libjava fails to compile if configure argument contains "version")
2007-09-05 Matthias Klose <doko@ubuntu.com> PR libgcj/33278 * configure.ac: Robustify extraction of gcj version. * configure: Regenerate. From-SVN: r128104
Diffstat (limited to 'libjava/configure.ac')
-rw-r--r--libjava/configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 134c054..e1fada2 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1381,7 +1381,7 @@ AC_SUBST(toolexecmainlibdir)
AC_SUBST(toolexeclibdir)
# Determine gcj and libgcj version number.
-gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
+gcjversion=`cat "$srcdir/../gcc/BASE-VER"`
libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version`
GCJVERSION=$gcjversion
AC_SUBST(GCJVERSION)