summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-04 21:32:41 +0000
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-04 21:32:41 +0000
commit4fd7cc4576a65583ee34619d4bc3e7f4a8e78813 (patch)
tree19ddc8657854302aec5920b81a154d6b8cc5ba2b /libjava
parent56535ebe90575acd283b54b5358383647fd0c7e8 (diff)
downloadgcc-4fd7cc4576a65583ee34619d4bc3e7f4a8e78813.tar.gz
2007-09-05 Matthias Klose <doko@ubuntu.com>
PR libgcj/33278 * configure.ac: Robustify extraction of gcj version. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128104 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rwxr-xr-xlibjava/configure2
-rw-r--r--libjava/configure.ac2
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3d6f0f51d28..6846f9b2af7 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 2a147242b48..89e5fff58df 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 134c054815b..e1fada2eddf 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)