summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2017-12-28 13:49:44 -0500
committerBradley Sepos <[email protected]>2018-01-10 01:39:54 -0500
commit680474d4df9fdcc96d00c459d0fe529db11320a1 (patch)
tree80d549a1465d7a43b5ffdd63741fe714f0db441e /make
parentb4e311b8fc02c302bac9b086ec7c725b92841186 (diff)
build: Update configure.py to check for nasm >= 2.13.
Required for recent x264. Better to fail here than part-way through a build.
Diffstat (limited to 'make')
-rw-r--r--make/configure.py1
1 files changed, 1 insertions, 0 deletions
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 )