bk commit into 5.1 tree (georg:1.2316)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-15 10:22:42+02:00, georg@stripped +1 -0
  added help output for configure script

  win/configure.js@stripped, 2006-09-15 10:22:38+02:00, georg@stripped +35 -1
    added help output for configure script

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1-win

--- 1.6/win/configure.js	2006-09-15 10:22:51 +02:00
+++ 1.7/win/configure.js	2006-09-15 10:22:51 +02:00
@@ -1,4 +1,18 @@
-// Configure.js
+/* Copyright (C) 2004-2006 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 ForReading = 1;
 ForWriting = 2;
@@ -44,6 +58,25 @@
             case "MYSQL_TCP_PORT":
                     default_port = parts[1];
                     break;
+			case "?":
+                    WScript.Echo("syntax: configure.js [options]");
+                    WScript.Echo("options:");
+                    WScript.Echo("  WITH_ARCHIVE_STORAGE_ENGINE     enable archive storage engine");
+                    WScript.Echo("  WITH_BLACKHOLE_STORAGE_ENGINE   enable blackhole storage engine");
+                    WScript.Echo("  WITH_EXAMPLE_STORAGE_ENGINE     enable example storage engine");
+                    WScript.Echo("  WITH_FEDERATED_STORAGE_ENGINE   enable federated storage engine");
+                    WScript.Echo("  WITH_INNOBASE_STORAGE_ENGINE    enable innobase storage engine");
+                    WScript.Echo("  WITH_EMBEDDED                   enable build of MySQL embedded server");
+                    WScript.Echo("  __NT__                          enable named pipes");
+                    WScript.Echo("  MYSQL_SERVER_SUFFIX=suffix      Server suffix (default none)");
+                    WScript.Echo("  COMPILATION_COMMENT=comment     Server comment");
+                    WScript.Echo("                                  default 'Source distribution')");
+                    WScript.Echo("  MYSQL_TCP_PORT=port             Server port (default 3306)");
+                    WScript.Echo("  ?                               Show this help text");
+					break;
+            default:
+                    throw new Error(1, "Invalid parameter: " + parts[0]);
+                    break;
         }
     }
 
@@ -74,6 +107,7 @@
 {
     WScript.Echo("Error: " + e.description);
 }
+
 
 function GetValue(str, key)
 {