From a1aac034cdba2c67ecb744a7caa18494f4932f13 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Wed, 26 Mar 2008 10:10:20 +0000
Subject: [PATCH] relax make version to 3.79.1, but still better to have >=
3.80 since the ORDER dependency is not supported in < 3.80.
git-svn-id: http://root.cern.ch/svn/root/trunk@22839 27541ba8-7e3a-0410-8455-c3a389f83636
---
configure | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 202bd2d2e55..ee53f16bd88 100755
--- a/configure
+++ b/configure
@@ -1353,25 +1353,25 @@ fi
# Mandatory test, must succeed
# Check for GNU make >= 3.80
#
-message "Checking for GNU Make version >= 3.80"
+message "Checking for GNU Make version >= 3.79.1"
gnumake="make"
-gnu=`$gnumake -v | awk 'BEGIN { FS=" "} { if (NR==1) print $1 }'`
+gnu=`$gnumake -v 2>&1 | awk 'BEGIN { FS=" "} { if (NR==1) print $1 }'`
if test ! "x$gnu" = "xGNU" ; then
gnumake="gmake"
- gnu=`$gnumake -v | awk 'BEGIN { FS=" "} { if (NR==1) print $1 }'`
+ gnu=`$gnumake -v 2>&1 | awk 'BEGIN { FS=" "} { if (NR==1) print $1 }'`
if test ! "x$gnu" = "xGNU" ; then
gnumake=""
fi
fi
if test ! "x$gnumake" = "x" ; then
- gnuv=`$gnumake -v | tr '.' ' ' | awk 'BEGIN { FS=" "} { if (NR==1) printf "%d", $3*100+$4 }'`
- if test $gnuv -lt 380 ; then
- result "`basename $0`: GNU Make >= 3.80 MUST be installed, current version $gnuv is too old"
+ gnuv=`$gnumake -v | tr '.' ' ' | awk 'BEGIN { FS=" "} { if (NR==1) printf "%d", ($3*1000)+($4*10)+$5 }'`
+ if test $gnuv -lt 3791 ; then
+ result "`basename $0`: GNU Make >= 3.79.1 MUST be installed, current version $gnuv is too old"
exit 1
fi
result "ok"
else
- result "`basename $0`: GNU Make >= 3.80 MUST be installed"
+ result "`basename $0`: GNU Make >= 3.79.1 MUST be installed"
exit 1
fi
--
GitLab