Re: lily 1.4.15

[Jan Nieuwenhuizen]

Peter Chubb <address@hidden> writes:

>>>>>> "Han-Wen" == Han-Wen Nienhuys <address@hidden> writes:
>
> Why does 1.4.15 depend on gcc version 2.8 (see configure.in)???  I
> have 2.95, 2.7.2 and 3.1 available.  

Could you try this patch?  It's not [yet] in CVS, I'd much rather have
the Debian gcc maintainer fix this issue.

Jan.


Index: aclocal.m4
===================================================================
RCS file: /home/lilypond/lilypond/aclocal.m4,v
retrieving revision 1.94
diff -p -u -r1.94 aclocal.m4
--- aclocal.m4  20 Jun 2002 11:08:52 -0000      1.94
+++ aclocal.m4  2 Jul 2002 12:56:32 -0000
@@ -20,17 +20,28 @@ AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
 
 # Get version string from executable ($1)
 AC_DEFUN(STEPMAKE_GET_VERSION, [
-    "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ##
+    ## ARG.
+    ## Workaround for broken Debian gcc version string:
+    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
+    ##
+    ## Assume, and hunt for, dotted version multiplet.
+    changequote(<<, >>)dnl
+    "$1" --version 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \
+       sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
+    changequote([, ])dnl
 ])
 
-# Calculate numeric version from version string ($1)
+# Calculate simplistic numeric version from version string ($1)
+# As yet, we have no need for something more elaborate.
 AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [
     echo "$1" | awk -F. '
     {
-      if ([$]3) {last = [$]3}
-      else {last =0}
+      if ([$]3) {three = [$]3}
+      else {three = 0}
     }
-    {printf "%s%s%s\n",[$]1*100, [$]2*10,last}'
+    {printf "%s%s%s\n", [$]1*100, [$]2*10, three}'
 ])
 
 
Index: stepmake/aclocal.m4
===================================================================
RCS file: /home/lilypond/lilypond/stepmake/aclocal.m4,v
retrieving revision 1.79
diff -p -u -r1.79 aclocal.m4
--- stepmake/aclocal.m4 20 Jun 2002 11:08:52 -0000      1.79
+++ stepmake/aclocal.m4 2 Jul 2002 12:56:33 -0000
@@ -17,17 +17,28 @@ AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
 
 # Get version string from executable ($1)
 AC_DEFUN(STEPMAKE_GET_VERSION, [
-    "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ##
+    ## ARG.
+    ## Workaround for broken Debian gcc version string:
+    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
+    ##
+    ## Assume, and hunt for, dotted version multiplet.
+    changequote(<<, >>)dnl
+    "$1" --version 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \
+       sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
+    changequote([, ])dnl
 ])
 
-# Calculate numeric version from version string ($1)
+# Calculate simplistic numeric version from version string ($1)
+# As yet, we have no need for something more elaborate.
 AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [
     echo "$1" | awk -F. '
     {
-      if ([$]3) {last = [$]3}
-      else {last =0}
+      if ([$]3) {three = [$]3}
+      else {three = 0}
     }
-    {printf "%s%s%s\n",[$]1*100, [$]2*10,last}'
+    {printf "%s%s%s\n", [$]1*100, [$]2*10, three}'
 ])
 
 

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org