wez Tue Dec 2 19:15:11 2003 EDT
Modified files:
/php-src/ext/com_dotnet config.w32
/php-src/win32/build config.w32 confutils.js
Log:
Clarify a little.
Index: php-src/ext/com_dotnet/config.w32
diff -u php-src/ext/com_dotnet/config.w32:1.1 php-src/ext/com_dotnet/config.w32:1.2
--- php-src/ext/com_dotnet/config.w32:1.1 Tue Dec 2 18:16:50 2003
+++ php-src/ext/com_dotnet/config.w32 Tue Dec 2 19:15:06 2003
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:50 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 00:15:06 wez Exp $
// 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 \
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.1 php-src/win32/build/config.w32:1.2
--- php-src/win32/build/config.w32:1.1 Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 19:15:10 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 00:15:10 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -11,7 +11,7 @@
// 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 @@
// 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")) {
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.1 php-src/win32/build/confutils.js:1.2
--- php-src/win32/build/confutils.js:1.1 Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/confutils.js Tue Dec 2 19:15:10 2003
@@ -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 @@
}
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++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
