From: Anatol Belski <ab@php.net>
Date: Mon, 11 Mar 2019 19:59:23 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.4RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Die hard if mc.exe or mt.exe not found
---

95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0
diff --cc win32/build/confutils.js
index 11fc7d2ae6,d943453bf8..82d10667bc
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -3016,10 -2934,11 +3016,12 @@@ function toolset_setup_project_tools(
  	}
  	PATH_PROG('zip');
  	PATH_PROG('lemon');
 +	PATH_PROG('7za');
  
  	// avoid picking up midnight commander from cygwin
- 	PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
+ 	if (!PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"))) {
+ 		ERROR('mc is required')
+ 	}
  
  	// Try locating the manifest tool
  	if (VS_TOOLSET) {