[Fwd: Re: [cp-patches] [RFC] require gcj 4 in build machinery]

[Mark Wielaard]

Forgot to CC classpath-patches.
If someone else (with more sed knowledge) could check that would be
appreciated.

Cheers,

Mark

--- Begin Message --- Subject: Re: [cp-patches] [RFC] require gcj 4 in build machinery Date: Fri, 09 Sep 2005 03:30:00 +0200

Hi Paul,

On Thu, 2005-09-08 at 20:24 +0100, Paul Jenner wrote:
> Now we require gcj 4 to build, should we not enforce that in build
> machinery?

Yes indeed.
I looked and it seems the sed expression trying to get the actual
version number doesn't work (at least not for me).
Something like the following does though:
sed -e 's/^[^0-9]*\([0-9.]*\).*/\1/' -e 'q'

Does this work correctly for you?

Thanks,

Mark

Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.6
diff -u -r1.6 acinclude.m4
--- m4/acinclude.m4     27 Aug 2005 20:12:55 -0000      1.6
+++ m4/acinclude.m4     9 Sep 2005 01:26:41 -0000
@@ -88,22 +88,17 @@
     ## a dot).
     ##
     ## Third, quit, so that we won't process the second and subsequent lines.
-    GCJ_VERSION=`$GCJ --version | sed -e 's/^@<:@^0-9@:>@*//' -e 
's/@<:@^.0-9@:>@@<:@^.0-9@:>@*//' -e 'q'` 
+    GCJ_VERSION=`$GCJ --version | sed -e 's/^[^0-9]*\([0-9.]*\).*/\1/' -e 'q'`
     GCJ_VERSION_MAJOR=`echo "$GCJ_VERSION" | cut -d '.' -f 1`
     GCJ_VERSION_MINOR=`echo "$GCJ_VERSION" | cut -d '.' -f 2`
 
-    if expr "$GCJ_VERSION_MAJOR" \< 3 > /dev/null; then
+    if expr "$GCJ_VERSION_MAJOR" \< 4 > /dev/null; then
       GCJ=""
     fi
-    if expr "$GCJ_VERSION_MAJOR" = 3 > /dev/null; then
-      if expr "$GCJ_VERSION_MINOR" \< 3; then
-        GCJ=""
-      fi
-    fi
     if test "x$GCJ" != x; then
       AC_MSG_RESULT($GCJ_VERSION)
     else
-      AC_MSG_WARN($GCJ_VERSION: gcj 3.3 or higher required)
+      AC_MSG_WARN($GCJ_VERSION: gcj 4 or higher required)
     fi
   fi 
 ])

signature.asc
Description: This is a digitally signed message part

--- End Message ---

signature.asc
Description: This is a digitally signed message part