com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/openssl/config.w32 win32/build/confutils.js

Commit:    f504e9eb7212320aa6df4d5503cb199535b5d116
Author:    Anatol Belski <[email protected]>         Mon, 24 Apr 2017 16:22:16 +0200
Parents:   d37c4b094869d05cc82071386ed9edcb28349b74 f7b8322b144122baddaf365c37dca3b8e547725e
Branches:  PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=f504e9eb7212320aa6df4d5503cb199535b5d116

Log:
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Support also no,shared configure arg vals by default

Changed paths:
  MM  ext/openssl/config.w32
  MM  win32/build/confutils.js


Diff:
diff --cc ext/openssl/config.w32
index 1f5fa39,c960853..ade17d4
--- a/ext/openssl/config.w32
+++ b/ext/openssl/config.w32
@@@ -1,25 -1,18 +1,25 @@@
  // $Id$
  // vim:ft=javascript
  
- ARG_WITH("openssl", "OpenSSL support", "no");
+ ARG_WITH("openssl", "OpenSSL support", "no,shared");
  
  if (PHP_OPENSSL != "no") {
 -	if (CHECK_LIB("ssleay32.lib", "openssl", PHP_OPENSSL) &&
 -			CHECK_LIB("libeay32.lib", "openssl", PHP_OPENSSL) &&
 -			CHECK_LIB("crypt32.lib", "openssl") &&
 -			CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_OPENSSL")) {
 -		EXTENSION("openssl", "openssl.c xp_ssl.c");
 +	var ret = SETUP_OPENSSL("openssl", PHP_OPENSSL);
  
 +	if (ret > 0) {
 +		EXTENSION("openssl", "openssl.c xp_ssl.c");
  		AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
  		AC_DEFINE("HAVE_OPENSSL", 1);
 -		AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
 +
 +		switch (ret) {
 +			/* Openssl 1.0.x and lower */
 +			case 1:
 +				AC_DEFINE("HAVE_DSA_DEFAULT_METHOD", 1);
 +				break;
 +			/* Openssl 1.1.x */
 +			case 2:
 +				break;
 +		}
  	}
  }