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
This commit is contained in:
Matthias Klose 2007-09-04 21:32:41 +00:00 committed by Matthias Klose
parent b2e34bc125
commit acd29efb0f
3 changed files with 8 additions and 2 deletions

View file

@ -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

2
libjava/configure vendored
View file

@ -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

View file

@ -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)