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

diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32
index 066d7bc8537792a5966610463af05e7d474fec40..c9608531b7d1527d747937a0a205c2e157249ea5 100644 (file)
--- 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 48ef2a6e0119cb3ef1efae848ceb85eb8580208b..a9ef15e70c7176e8052d9b1f69a2de7fe920126e 100644 (file)
--- 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;");