From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 2 Jul 2002 22:19:53 +0000 (+0000)
Subject: Workaround for broken Debian gcc version string: 'gcc (GCC) 3.1.1
X-Git-Tag: release/1.5.65~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ac2d947273e914c34dd5fbb1c23e299434b2d63;p=lilypond.git

Workaround for broken Debian gcc version string: 'gcc (GCC) 3.1.1
20020606 (Debian prerelease)'
---

diff --git a/ChangeLog b/ChangeLog
index f2044638f7..1d3cc75c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* stepmake/aclocal.m4 (STEPMAKE_GET_VERSION): Workaround for
+	broken Debian gcc version string: 'gcc (GCC) 3.1.1 20020606
+	(Debian prerelease)'
+
 2002-07-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* lily/bar-check-iterator.cc (process): change
diff --git a/aclocal.m4 b/aclocal.m4
index 4a7e7f0925..686026ab08 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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}'
 ])
 
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index d076ebc03a..9b05585edd 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -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}'
 ])