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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3d6f0f5..6846f9b 100644 (file)
--- 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 2a14724..89e5fff 100755 (executable)
--- 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 134c054..e1fada2 100644 (file)
--- 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)