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

[Daniel Fischer]

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

 2786 Daniel Fischer	2008-10-21
      more 6.0 changes
modified:
  BUILD/preconfigure

=== modified file 'BUILD/preconfigure'
--- a/BUILD/preconfigure	2008-10-21 16:03:39 +0000
+++ b/BUILD/preconfigure	2008-10-21 17:58:22 +0000
@@ -124,10 +124,10 @@ our $default = {
         '--with-archive-storage-engine' => undef,
         '--with-blackhole-storage-engine' => undef,
         '--with-csv-storage-engine' => undef,
-        '--with-falcon-storage-engine' => undef,
+        '--without-example-storage-engine' => undef,
+        '--with-falcon' => undef,
         '--with-federated-storage-engine' => undef,
         '--with-innodb' => undef,
-        '--with-ndbcluster' => undef,
         '--with-embedded-server' => undef,
         '--with-partition' => undef,
         '--with-readline' => undef,
@@ -135,6 +135,8 @@ our $default = {
         '--with-yassl' => undef,
         '--with-client-ldflags' => '-static',
         '--with-mysqld-ldflags' => '-static',
+        '--with-zlib-dir' => 'bundled',
+        '--with-server-suffix' => '',
     },
     'win' => {
         'WITH_HEAP_STORAGE_ENGINE' => undef,
@@ -163,7 +165,7 @@ our $debug = {
     },
     'opt' => {
         '--with-debug' => undef,
-        '--without-ndb-debug' => undef,
+        '--with-server-suffix' => '-debug',
     },
     'win' => {
     },
@@ -177,7 +179,7 @@ our $products = {
     # community uses the default set of engines
     'community' => {
         'opt' => {
-            '--with-extra-charsets' => 'all',
+            '--without-ndbcluster' => undef,
         },
         'win' => {
         },
@@ -382,42 +384,6 @@ our $platforms = {
     },
 
 ##############################################################################
-# solaris8-sparc-32bit
-#
-    'solaris8-sparc-32bit' => {
-        'env' => {
-            'CFLAGS' => '-g -xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v8',
-            'CC' => 'cc-5.0',
-            'CXXFLAGS' => '-g -xO3 -noex -mt -D_FORTEC_ -xarch=v8',
-            'CXX' => 'CC',
-            'ASFLAGS' => '-xarch=v8',
-        },
-        'opt' => {
-            '--with-named-z-libs' => 'no',
-            '--enable-assembler' => undef,
-            '--with-named-curses-libs' => '-lcurses',
-        },
-    },
-
-##############################################################################
-# solaris8-sparc-64bit
-#
-    'solaris8-sparc-64bit' => {
-        'env' => {
-            'CFLAGS' => '-g -xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v9',
-            'CC' => 'cc-5.0',
-            'LDFLAGS' => '-xarch=v9',
-            'CXXFLAGS' => '-g -xO3 -noex -mt -D_FORTEC_ -xarch=v9',
-            'CXX' => 'CC',
-            'ASFLAGS' => '-xarch=v9',
-        },
-        'opt' => {
-            '--with-named-z-libs' => 'no',
-            '--with-named-curses-libs' => '-lcurses',
-        },
-    },
-
-##############################################################################
 # solaris8-x86
 #
     'solaris8-x86' => {
@@ -485,6 +451,7 @@ our $platforms = {
             '--with-system-type' => 'ibm-i5os',
             '--host' => 'powerpc-ibm-aix5.3.0.0',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -506,6 +473,7 @@ our $platforms = {
             '--with-system-type' => 'ibm-i5os',
             '--host' => 'powerpc-ibm-aix5.3.0.0',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -523,6 +491,7 @@ our $platforms = {
         'opt' => {
             '--with-named-z-libs' => 'no',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -541,6 +510,7 @@ our $platforms = {
         'opt' => {
             '--with-named-z-libs' => 'no',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -558,6 +528,7 @@ our $platforms = {
         'opt' => {
             '--with-named-z-libs' => 'no',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -576,6 +547,7 @@ our $platforms = {
         'opt' => {
             '--with-named-z-libs' => 'no',
             '!--with-yassl' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -637,6 +609,7 @@ our $platforms = {
         },
         'opt' => {
             '--with-fast-mutexes' => undef,
+            '--without-falcon' => undef,
         },
     },
 
@@ -774,6 +747,7 @@ our $platforms = {
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
+            '--without-falcon' => undef,
         },
     },
 
@@ -789,6 +763,7 @@ our $platforms = {
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
+            '--without-falcon' => undef,
         },
     },
 
@@ -818,6 +793,7 @@ our $platforms = {
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
+            '--without-falcon' => undef,
         },
     },
 
@@ -846,6 +822,7 @@ our $platforms = {
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
+            '--without-falcon' => undef,
         },
     },
 
@@ -860,6 +837,7 @@ our $platforms = {
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
+            '--without-falcon' => undef,
         },
     },