[vlc-commits] tools: bootstrap: Fix nasm version check

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 26 13:19:38 2018 +0200| [d82138e36328f0bd92bd41a59a0f8cc98d9a325b] | committer: David Fuhrmann

tools: bootstrap: Fix nasm version check

(cherry picked from commit 6839a212a1032c33dbfdaafe1b69bc795aa374f4)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d82138e36328f0bd92bd41a59a0f8cc98d9a325b
---

 extras/tools/bootstrap | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 83cc33cea9..3f87f6dce0 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -43,6 +43,19 @@ then
 fi
 }
 
+check_nasm() {
+if ! nasm -v >/dev/null 2>&1
+then
+    echo "nasm not found"
+    NEEDED="$NEEDED .nasm"
+else
+    # found, need to check version ?
+    [ -z "$1" ] && return # no
+    gotver=`nasm -v | cut -d ' ' -f 3`
+    check_version nasm $gotver $1
+fi
+}
+
 check() {
 if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1
 then
@@ -85,7 +98,7 @@ check ant
 check xz
 check bison 3.0.0
 check flex
-check nasm 2.13.01
+check_nasm 2.13.01
 check meson 0.48.1
 check ninja