diff options
| author | sr55 <[email protected]> | 2019-11-10 16:39:52 +0000 |
|---|---|---|
| committer | Scott <[email protected]> | 2019-11-15 22:14:47 +0000 |
| commit | 6d7f540faff034861f8827d19a31377aa26b0c84 (patch) | |
| tree | 370714b9591f263b34fc1f18a26ecf40ed09955d | |
| parent | 07a7ba68761fdd70edc9bfec1ed93288c92279cf (diff) | |
Resolve Rebase
| -rw-r--r-- | make/configure.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/make/configure.py b/make/configure.py index 86dd6c119..6009de0ed 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1606,8 +1606,7 @@ try: automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=[1,15,0] ) libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=True ) lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False ) - pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,29,0] ) - + pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,29,1] ) meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,47,0] ) nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] ) ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True ) |