[Lunar-commits] <moonbase> Revert "mysql: more fixes."

[Florin Braescu]

commit 40bba6898f1d0f82e1da4551567c09acacb6c3df
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Feb 25 19:00:12 2010 +0200

    Revert "mysql: more fixes."
    
    This reverts commit 851b4fc7c3611c0eabbf51400356c700201d8a33.
    
    mysql: first step to revert.
---
 sql/mysql/BUILD     |    1 +
 sql/mysql/CONFIGURE |   20 ++++++++++++++++----
 sql/mysql/DEPENDS   |    5 +++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/sql/mysql/BUILD b/sql/mysql/BUILD
index 667fc18..526fb48 100644
--- a/sql/mysql/BUILD
+++ b/sql/mysql/BUILD
@@ -17,6 +17,7 @@
 
   ./configure  --prefix=/usr                   \
                --disable-dependency-tracking   \
+               --without-bench                 \
                --without-debug                 \
                --without-readline              \
                --without-libedit               \
diff --git a/sql/mysql/CONFIGURE b/sql/mysql/CONFIGURE
index 3ee285a..3fa7da9 100644
--- a/sql/mysql/CONFIGURE
+++ b/sql/mysql/CONFIGURE
@@ -17,15 +17,27 @@ if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
        OPTS="$OPTS --without-server"
   else
     if  query  "Enable InnoDB Support? Needed by KDE4/Akonadi " n; then
-      OPTS="$OPTS --with-plugins=innodb_plugin"
+      OPTS="$OPTS --with-innodb"
     else
-      OPTS="$OPTS --without-plugin-innodb_plugin"
+      OPTS="$OPTS --without-innodb"
+    fi
+
+    if  query  "Enable RAID Support? " n; then
+      OPTS="$OPTS --with-raid"
+    else
+      OPTS="$OPTS --without-raid"
+    fi
+
+    if  query  "Include the Virtual IO support? " n; then
+      OPTS="$OPTS --with-vio"
+    else
+      OPTS="$OPTS --without-vio"
     fi
 
     if query "Include the NDB Cluster table handler? " n; then
-      OPTS="$OPTS --with-plugins=ndbcluster"
+      OPTS="$OPTS --with-ndbcluster"
     else
-      OPTS="$OPTS --without-plugin-ndbcluster"
+      OPTS="$OPTS --without-ndbcluster"
     fi
 
     if query "Support tables with more than 4 G rows even on 32 bit platforms? " n; then
diff --git a/sql/mysql/DEPENDS b/sql/mysql/DEPENDS
index 219beb9..2bc80cd 100644
--- a/sql/mysql/DEPENDS
+++ b/sql/mysql/DEPENDS
@@ -1,6 +1,11 @@
 depends  chkconfig
 depends  perl
 
+optional_depends  "db"                    \
+                  "--with-berkley-db"     \
+                  "--without-berkley-db"  \
+                  "for Berkley DB support"
+
 optional_depends  "openssl"        \
                   "--with-ssl"     \
                   "--without-ssl"  \