clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source 
* PHP-7.1:
  Support also no,shared configure arg vals by default
This commit is contained in:
Anatol Belski 2017-04-24 16:22:57 +02:00
commit 632d68f5f9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/openssl/config.w32
View File

@ -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);

11
win32/build/confutils.js
View File

@ -381,10 +381,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;");