com php-src: Support also no,shared configure arg vals by default: ext/openssl/config.w32 win32/build/confutils.js

Commit:    f7b8322b144122baddaf365c37dca3b8e547725e
Author:    Anatol Belski <[email protected]>         Mon, 24 Apr 2017 15:46:22 +0200
Parents:   dd36541f2cb67223085a68f63c35a6a9c37e7a86
Branches:  PHP-7.0 PHP-7.1 master

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

Log:
Support also no,shared configure arg vals by default

This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static

Bugs:
https://bugs.php.net/74398

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


Diff:
diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32
index 066d7bc..c960853 100644
--- a/ext/openssl/config.w32
+++ b/ext/openssl/config.w32
@@ -1,7 +1,7 @@
 // $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) &&
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 48ef2a6..a9ef15e 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -389,10 +389,17 @@ function conf_process_args()
 				} else {
 					/* we matched the non-default arg */
 					if (argval == null) {
-						argval = arg.defval == "no" ? "yes" : "no";
+						if (arg.defval == "no") {
+							argval = "yes";
+						} else if (arg.defval == "no,shared") {
+							argval = "yes,shared";
+							shared = true;
+						} else {
+							argval = "no";
+						}
 					}
 				}
-				
+
 				arg.argval = argval;
 				eval("PHP_" + arg.symval + " = argval;");
 				eval("PHP_" + arg.symval + "_SHARED = shared;");