From: Bradley Sepos <bradley@bradleysepos.com>
Date: Thu, 28 Dec 2017 18:49:44 +0000 (-0500)
Subject: build: Update configure.py to check for nasm >= 2.13.
X-Git-Tag: 1.1.0~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=680474d4df9fdcc96d00c459d0fe529db11320a1;p=handbrake

build: Update configure.py to check for nasm >= 2.13.

Required for recent x264. Better to fail here than part-way through a build.
---

diff --git a/make/configure.py b/make/configure.py
index 71f310ea5..f40259811 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1524,6 +1524,7 @@ try:
         ranlib   = ToolProbe( 'RANLIB.exe',   'ranlib' )
         strip    = ToolProbe( 'STRIP.exe',    'strip' )
         tar      = ToolProbe( 'TAR.exe',      'gtar', 'tar' )
+        nasm     = ToolProbe( 'NASM.exe',     'nasm', abort=True, minversion=[2,13,0] )
         yasm     = ToolProbe( 'YASM.exe',     'yasm', abort=False, minversion=[1,2,0] )
         autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
         automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )