From f7b8322b144122baddaf365c37dca3b8e547725e Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 24 Apr 2017 15:46:22 +0200 Subject: 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 --- ext/openssl/config.w32 | 2 +- win32/build/confutils.js | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32 index 066d7bc853..c9608531b7 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 48ef2a6e01..a9ef15e70c 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;"); -- cgit v1.2.1