diff options
| author | Anatol Belski <ab@php.net> | 2017-04-24 16:22:16 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-24 16:22:16 +0200 |
| commit | f504e9eb7212320aa6df4d5503cb199535b5d116 (patch) | |
| tree | c570dd7e1528cdc970ef1275a91a97db758adce0 | |
| parent | d37c4b094869d05cc82071386ed9edcb28349b74 (diff) | |
| parent | f7b8322b144122baddaf365c37dca3b8e547725e (diff) | |
| download | php-git-f504e9eb7212320aa6df4d5503cb199535b5d116.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Support also no,shared configure arg vals by default
| -rw-r--r-- | ext/openssl/config.w32 | 2 | ||||
| -rw-r--r-- | 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 1f5fa39b85..ade17d402a 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") { var ret = SETUP_OPENSSL("openssl", PHP_OPENSSL); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index c750bb1a45..e218430ae7 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;"); |