com php-src: Bail on invalid configure args if this is a snapshot build (as suggested by Anatol): win32/build/confutils.js
| From: | Kalle Sommer Nielsen | Date: | Mon, 24 Jul 2017 21:38:09 +0000 |
| Subject: | com php-src: Bail on invalid configure args if this is a snapshot build (as suggested by Anatol): win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98778@lists.php.net to get a copy of this message | ||
Commit: 3964678d492b698a20aa4eace02ab95636ec6f2d
Author: Kalle Sommer Nielsen <kalle@php.net> Mon, 24 Jul 2017 23:38:09 +0200
Parents: d6012671a86faa4ea216ddd4b6bf5fc62cc4c177
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3964678d492b698a20aa4eace02ab95636ec6f2d
Log:
Bail on invalid configure args if this is a snapshot build (as suggested by Anatol)
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 0c88d13..3a5f957 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -406,14 +406,14 @@ function conf_process_args()
}
if (!found) {
INVALID_CONFIG_ARGS[INVALID_CONFIG_ARGS.length] = argname;
-
- /*
- STDERR.WriteLine("Unknown option " + argname + "; please try configure.js --help
for a list of valid options");
- WScript.Quit(2);
- */
}
}
+ if (PHP_SNAPSHOT_BUILD != 'no' && INVALID_CONFIG_ARGS.length) {
+ STDERR.WriteLine('Unknown option ' + INVALID_CONFIG_ARGS[0] + '; please try
configure.js --help for a list of valid options');
+ WScript.Quit(2);
+ }
+
if (configure_help_mode) {
STDOUT.WriteLine(word_wrap_and_indent(0,
"Options that enable extensions and SAPI will accept \