summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-12-03 00:15:10 +0000
committerWez Furlong <wez@php.net>2003-12-03 00:15:10 +0000
commit2d0eaa398921641ed99b029c030ced40e86b7535 (patch)
treeb76106604890a875386b0ecaa5621f04dd7d6377
parent05b9b20ed8e2f98b3fb71a227e49e11bdf7b9c6b (diff)
downloadphp-git-2d0eaa398921641ed99b029c030ced40e86b7535.tar.gz
Clarify a little.
-rw-r--r--ext/com_dotnet/config.w322
-rw-r--r--win32/build/config.w324
-rw-r--r--win32/build/confutils.js13
3 files changed, 15 insertions, 4 deletions
diff --git a/ext/com_dotnet/config.w32 b/ext/com_dotnet/config.w32
index 1ab9026926..239a5446df 100644
--- a/ext/com_dotnet/config.w32
+++ b/ext/com_dotnet/config.w32
@@ -1,7 +1,7 @@
// $Id$
// vim:ft=javascript
-ARG_ENABLE("com_dotnet", "COM and .Net support", "yes");
+ARG_ENABLE("com-dotnet", "COM and .Net support", "yes");
if (PHP_COM_DOTNET == "yes") {
EXTENSION("com_dotnet", "com_com.c com_dotnet.c com_extension.c \
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 7a36040320..f7fb39c53c 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -11,7 +11,7 @@ PATH_PROG('make');
// one-shot build optimizes build by asking compiler to build
// several objects at once, reducing overhead of starting new
// compiler processes.
-ARG_ENABLE('one-shot', 'optimize for fast one-shot build', 'no');
+ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and snapshot builders, not so hot for edit-and-rebuild hacking', 'no');
ARG_ENABLE('debug', 'Compile with debugging symbols', "no");
ARG_ENABLE('zts', 'Thread safety', 'yes');
@@ -85,7 +85,7 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
// Find the php_build dir - it contains headers and libraries
// that we need
-ARG_WITH('php-build', 'where the php_build dir can be found', 'no');
+ARG_WITH('php-build', 'Where the php_build dir can be found. Assumes that it is a sibling of this source dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == "no") {
if (FSO.FolderExists("..\\php_build")) {
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 9bfa46397d..e003d98030 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.1 2003-12-02 23:17:04 wez Exp $
+// $Id: confutils.js,v 1.2 2003-12-03 00:15:10 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -201,6 +201,17 @@ function conf_process_args()
}
if (configure_help_mode) {
+ STDOUT.WriteLine(word_wrap_and_indent(0,
+"Options that enable extensions and SAPI will accept \
+'yes' or 'no' as a parameter. They also accept 'shared' \
+as a synonym for 'yes' and request a shared build of that \
+module. Not all modules can be built as shared modules; \
+configure will display [shared] after the module name if \
+can be built that way. \
+"
+ ));
+ STDOUT.WriteBlankLines(1);
+
// Measure width to pretty-print the output
max_width = 0;
for (i = 0; i < configure_args.length; i++) {