From acd29efb0f17f0ec7e2452b7440dd3fd666b6ce2 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 4 Sep 2007 21:32:41 +0000
Subject: [PATCH] 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
---
libjava/ChangeLog | 6 ++++++
libjava/configure | 2 +-
libjava/configure.ac | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3d6f0f51d28e..6846f9b2af7a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-04 Matthias Klose <doko@ubuntu.com>
+
+ PR libgcj/33278
+ * configure.ac: Robustify extraction of gcj version.
+ * configure: Regenerate.
+
2007-09-04 Andrew Haley <aph@redhat.com>
PR java/27908
diff --git a/libjava/configure b/libjava/configure
index 2a147242b48f..89e5fff58df2 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -26188,7 +26188,7 @@ esac
# 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
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 134c054815b5..e1fada2eddfd 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)
--
GitLab