bzr commit into mysql-6.0 branch (df:2791)

[Daniel Fischer]

#At file:///shared/home/df/mysql/bazaar/mysql-6.0-preconfigure/

 2791 Daniel Fischer	2008-10-22 [merge]
      merge
modified:
  BUILD/preconfigure

=== modified file 'BUILD/preconfigure'
--- a/BUILD/preconfigure	2008-10-21 19:40:37 +0000
+++ b/BUILD/preconfigure	2008-10-22 13:40:13 +0000
@@ -1234,9 +1234,9 @@ while(@ARGV) {
         last if $arg eq "--";
         my $var = substr($arg, 2);
         if(defined $vars->{$var}) {
-            # if a known command line option from $vars is specified, 
-            # overwrite previous setting with new setting, or add 1 if
-            # no value is specified
+            # if a known command line option from $vars is specified,
+            # add 1 to a numeric value, or in all other cases,
+            # overwrite previous setting with new setting
             if($vars->{$var} =~ /^[0-9]+$/) {
                 $vars->{$var} += 1;
             } else {
@@ -1263,7 +1263,7 @@ my $pass_on = { "opt" => {}, "win" => {}
 while(@ARGV) {
     my $arg = shift;
     my $val = undef;
-    if($arg =~ /^([-a-zA-Z-0-9_]+)=(.*)$/) {
+    if($arg =~ /^([-a-zA-Z0-9_]+)=(.*)$/) {
         $arg = $1;
         $val = $2;
     }