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

[Florin Braescu]

commit 851b4fc7c3611c0eabbf51400356c700201d8a33
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Mon Feb 22 23:47:59 2010 +0200

    mysql: more fixes.
---
 sql/mysql/BUILD     |    1 -
 sql/mysql/CONFIGURE |   20 ++++----------------
 sql/mysql/DEPENDS   |    5 -----
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/sql/mysql/BUILD b/sql/mysql/BUILD
index 526fb48..667fc18 100644
--- a/sql/mysql/BUILD
+++ b/sql/mysql/BUILD
@@ -17,7 +17,6 @@
 
   ./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 3fa7da9..3ee285a 100644
--- a/sql/mysql/CONFIGURE
+++ b/sql/mysql/CONFIGURE
@@ -17,27 +17,15 @@ 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-innodb"
+      OPTS="$OPTS --with-plugins=innodb_plugin"
     else
-      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"
+      OPTS="$OPTS --without-plugin-innodb_plugin"
     fi
 
     if query "Include the NDB Cluster table handler? " n; then
-      OPTS="$OPTS --with-ndbcluster"
+      OPTS="$OPTS --with-plugins=ndbcluster"
     else
-      OPTS="$OPTS --without-ndbcluster"
+      OPTS="$OPTS --without-plugin-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 2bc80cd..219beb9 100644
--- a/sql/mysql/DEPENDS
+++ b/sql/mysql/DEPENDS
@@ -1,11 +1,6 @@
 depends  chkconfig
 depends  perl
 
-optional_depends  "db"                    \
-                  "--with-berkley-db"     \
-                  "--without-berkley-db"  \
-                  "for Berkley DB support"
-
 optional_depends  "openssl"        \
                   "--with-ssl"     \
                   "--without-ssl"  \