From: Anatol Belski <ab@php.net>
Date: Mon, 24 Apr 2017 14:22:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f504e9eb7212320aa6df4d5503cb199535b5d116;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

f504e9eb7212320aa6df4d5503cb199535b5d116
diff --cc ext/openssl/config.w32
index 1f5fa39b85,c9608531b7..ade17d402a
--- 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;
 +		}
  	}
  }