Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 collab/openldap/DEPENDS  |    2 +-
 collab/openldap/HISTORY  |    3 +++
 database/mysql/BUILD     |   43 ++++++++++++++++++++-----------------------
 database/mysql/CONFIGURE |    3 +++
 database/mysql/HISTORY   |    7 +++++++
 5 files changed, 34 insertions(+), 24 deletions(-)

New commits:
commit 47fef12ac73593d85e1741762a1546a4ec42021f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mysql: Cleanup MSQL_ENGINES
    
    After a while (or a bug a while ago), MSQL_ENGINES looks like:
    [[ What additional storage engines to build? -> 'FEDERATED FEDERATED
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
    InnoDB InnoDB ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster
    ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster
    ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster' ]]

commit 21c9131384878c6c10f8071d76bc59c215018bea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mysql: ndbcluster requires ndb-test for API
    Some plugins fail with -Wl,--as-needed (e.g. ndbcluster)

commit 062e0c437a721eef3c8cd7769ee9d0f9473bfb2e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mysql: Fix plugin configure flags
    
    configure: WARNING: unrecognized options: --with-ndbcluster, 
--with-innodb,
    --with-federated-storage-engine, --without-example-storage-engine,
    --without-blackhole-storage-engine, --without-archive-storage-engine
    
    Some plugins do not have disables:
        archive, blackhole, example

commit 306dafd30e03280d2dc4a959fac0279b6fa50f5c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mysql: Fix MySQL NDB disable
    
    openldap-2.4.31/configure --help|grep ndb
        --enable-ndb          enable MySQL NDB Cluster backend no|yes|mod
    [no
    
    checking for NdbApi.hpp... yes
    checking for ndb_init in -lndbclient... no
    configure: error: could not locate ndbclient library

diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index 7840dd8..84213db 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -70,7 +70,7 @@ if list_find "$OPENLDAP_OPTS" "--enable-slapd"; then
 
   optional_depends -sub NDB MYSQL \
                             "--enable-ndb=mod" \
-                            "--disable-ndb" \
+                            "--enable-ndb=no" \
                             "for MySQL/MariaDB NDB Cluster backend" &&
 
   optional_depends perl                 \
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 212b7f6..bf22be3 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,6 @@
+2012-06-26 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Correct MySQL NDB disable flag
+
 2012-06-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: 2.4.31 goes stable; updated source uri
        * BUILD: fixed compilation with nss+nspr for moznss support; switched 
to
diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index 2b60912..0d92aae 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -1,51 +1,48 @@
 OPTS="--with-charset=$MSQL_CHARSET $OPTS" &&
 
 if  list_find "$MSQL_ENGINES" "none"  ;  then
-   OPTS="--without-archive-storage-engine    \
-         --without-berkeley-db               \
-         --without-blackhole-storage-engine  \
-         --without-example-storage-engine    \
-         --without-federated-storage-engine  \
-         --without-innodb                    \
-         --without-ndbcluster                \
+   OPTS="--without-berkeley-db               \
+         --without-plugin-federated          \
+         --without-plugin-innodb_plugin      \
+         --without-plugin-ndbcluster         \
          $OPTS"
 else
+  LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
+
+  # Cleanup MSQL_ENGINES
+  MSQL_ENGINES=$(echo $MSQL_ENGINES | tr ' ' '\n' | awk '!_[$0]++' | tr 
'$\n' ' ')
+
   if  list_find "$MSQL_ENGINES" "ARCHIVE"  ;  then
-    OPTS="--with-archive-storage-engine $OPTS"
-  else
-    OPTS="--without-archive-storage-engine $OPTS"
+    PLUGINS="$PLUGINS,archive"
   fi                                                     &&
   if  ! list_find "$MSQL_ENGINES" "BerkeleyDB"  ;  then
     OPTS="--without-berkeley-db $OPTS"
   fi                                                     &&
   if  list_find "$MSQL_ENGINES" "BLACKHOLE"  ;  then
-    OPTS="--with-blackhole-storage-engine $OPTS"
-  else
-    OPTS="--without-blackhole-storage-engine $OPTS"
+    PLUGINS="$PLUGINS,blackhole"
   fi                                                     &&
   if  list_find "$MSQL_ENGINES" "EXAMPLE"  ;  then
-    OPTS="--with-example-storage-engine $OPTS"
-  else
-    OPTS="--without-example-storage-engine $OPTS"
+    PLUGINS="$PLUGINS,example"
   fi                                                     &&
   if  list_find "$MSQL_ENGINES" "FEDERATED"  ;  then
-    OPTS="--with-federated-storage-engine $OPTS"
+    PLUGINS="$PLUGINS,federated"
   else
-    OPTS="--without-federated-storage-engine $OPTS"
+    OPTS="--without-plugin-federated $OPTS"
   fi                                                     &&
   if  list_find "$MSQL_ENGINES" "InnoDB"  ;  then
-    OPTS="--with-innodb $OPTS"
+    PLUGINS="$PLUGINS,innodb_plugin"
   else
-    OPTS="--without-innodb $OPTS"
+    OPTS="--without-plugin-innodb_plugin $OPTS"
   fi                                                     &&
   if  list_find "$MSQL_ENGINES" "ndbcluster"  ;  then
-    OPTS="--with-ndbcluster $OPTS"
+    PLUGINS="$PLUGINS,ndbcluster" &&
+    OPTS="--with-ndb-test $OPTS"
   else
-    OPTS="--without-ndbcluster $OPTS"
+    OPTS="--without-plugin-ndbcluster $OPTS"
   fi
 fi                                                       &&
 
-OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS"                    &&
+OPTS="$MSQL_SERVER $MSQL_EMBED --with-plugins=$PLUGINS $OPTS"  &&
 CFLAGS="${CFLAGS//-ffast-math}"                          &&
 
 create_account mysql                                     &&
diff --git a/database/mysql/CONFIGURE b/database/mysql/CONFIGURE
index 442582b..d6960b6 100755
--- a/database/mysql/CONFIGURE
+++ b/database/mysql/CONFIGURE
@@ -59,6 +59,9 @@ config_query_multi   MSQL_ENGINES                           
      \
 if  list_find "$MSQL_ENGINES"  "all"
 then
   MSQL_ENGINES="ARCHIVE BerkeleyDB BLACKHOLE EXAMPLE FEDERATED InnoDB 
ndbcluster"
+elif list_find "$MSQL_ENGINES" "none"
+then
+  MSQL_ENGINES="none"
 fi                                                                &&
 
 config_query_option  MSQL_EMBED                                   \
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index a9e56e0..2a9dba1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,10 @@
+2012-06-26 Eric Sandall <sandalle AT sourcemage.org>
+       * CONFIGURE: Cleanup MSQL_ENGINES for "none"
+       * BUILD: Fix plugin configure flags
+         ndbcluster requires ndb-test for testing
+         Disable LDFLAGS -Wl,--as-needed when building plugins
+         Cleanup MSQL_ENGINES after everything is defined
+
 2012-03-02 Arjan Bouter <abouter AT sourcemage.org>
        * SUB_DEPENDS, PRE_SUB_DEPENDS: added NDB for ndbcluster