4 files changed, 71 insertions, 40 deletions
diff --git a/config/ac-macros/ha_berkeley.m4 b/config/ac-macros/ha_berkeley.m4
index 732c7730816..5463f10ca98 100644
--- a/config/ac-macros/ha_berkeley.m4
+++ b/config/ac-macros/ha_berkeley.m4
@@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
 dnl echo ["MYSQL_SEARCH_FOR_BDB"]
   bdb_dir_ok="no BerkeleyDB found"
 
-  for test_dir in $srcdir/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
+  for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
 dnl    echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
     MYSQL_CHECK_BDB_DIR([$test_dir])
     if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
diff --git a/config/ac-macros/ha_innodb.m4 b/config/ac-macros/ha_innodb.m4
index 17f0fab3e90..287b77c8851 100644
--- a/config/ac-macros/ha_innodb.m4
+++ b/config/ac-macros/ha_innodb.m4
@@ -20,45 +20,45 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
       AC_MSG_RESULT([Using Innodb])
       AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
       have_innodb="yes"
-      innodb_includes="-I../innobase/include"
+      innodb_includes="-I\$(top_builddir)/innobase/include"
       innodb_system_libs=""
 dnl Some libs are listed several times, in order for gcc to sort out
 dnl circular references.
       innodb_libs="\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/dict/libdict.a\
- \$(top_builddir)/innobase/que/libque.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/row/librow.a\
- \$(top_builddir)/innobase/pars/libpars.a\
- \$(top_builddir)/innobase/btr/libbtr.a\
- \$(top_builddir)/innobase/trx/libtrx.a\
- \$(top_builddir)/innobase/read/libread.a\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/buf/libbuf.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/eval/libeval.a\
- \$(top_builddir)/innobase/log/liblog.a\
- \$(top_builddir)/innobase/fsp/libfsp.a\
- \$(top_builddir)/innobase/fut/libfut.a\
- \$(top_builddir)/innobase/fil/libfil.a\
- \$(top_builddir)/innobase/lock/liblock.a\
- \$(top_builddir)/innobase/mtr/libmtr.a\
- \$(top_builddir)/innobase/page/libpage.a\
- \$(top_builddir)/innobase/rem/librem.a\
- \$(top_builddir)/innobase/thr/libthr.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/data/libdata.a\
- \$(top_builddir)/innobase/mach/libmach.a\
- \$(top_builddir)/innobase/ha/libha.a\
- \$(top_builddir)/innobase/dyn/libdyn.a\
- \$(top_builddir)/innobase/mem/libmem.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/ut/libut.a\
- \$(top_builddir)/innobase/os/libos.a\
- \$(top_builddir)/innobase/ut/libut.a"
+ \$(top_builddir)/storage/innobase/usr/libusr.a\
+ \$(top_builddir)/storage/innobase/srv/libsrv.a\
+ \$(top_builddir)/storage/innobase/dict/libdict.a\
+ \$(top_builddir)/storage/innobase/que/libque.a\
+ \$(top_builddir)/storage/innobase/srv/libsrv.a\
+ \$(top_builddir)/storage/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/storage/innobase/row/librow.a\
+ \$(top_builddir)/storage/innobase/pars/libpars.a\
+ \$(top_builddir)/storage/innobase/btr/libbtr.a\
+ \$(top_builddir)/storage/innobase/trx/libtrx.a\
+ \$(top_builddir)/storage/innobase/read/libread.a\
+ \$(top_builddir)/storage/innobase/usr/libusr.a\
+ \$(top_builddir)/storage/innobase/buf/libbuf.a\
+ \$(top_builddir)/storage/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/storage/innobase/eval/libeval.a\
+ \$(top_builddir)/storage/innobase/log/liblog.a\
+ \$(top_builddir)/storage/innobase/fsp/libfsp.a\
+ \$(top_builddir)/storage/innobase/fut/libfut.a\
+ \$(top_builddir)/storage/innobase/fil/libfil.a\
+ \$(top_builddir)/storage/innobase/lock/liblock.a\
+ \$(top_builddir)/storage/innobase/mtr/libmtr.a\
+ \$(top_builddir)/storage/innobase/page/libpage.a\
+ \$(top_builddir)/storage/innobase/rem/librem.a\
+ \$(top_builddir)/storage/innobase/thr/libthr.a\
+ \$(top_builddir)/storage/innobase/sync/libsync.a\
+ \$(top_builddir)/storage/innobase/data/libdata.a\
+ \$(top_builddir)/storage/innobase/mach/libmach.a\
+ \$(top_builddir)/storage/innobase/ha/libha.a\
+ \$(top_builddir)/storage/innobase/dyn/libdyn.a\
+ \$(top_builddir)/storage/innobase/mem/libmem.a\
+ \$(top_builddir)/storage/innobase/sync/libsync.a\
+ \$(top_builddir)/storage/innobase/ut/libut.a\
+ \$(top_builddir)/storage/innobase/os/libos.a\
+ \$(top_builddir)/storage/innobase/ut/libut.a"
 
       AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
       ;;
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 509cd868909..356108ad9ea 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -137,13 +137,14 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
   ndb_mgmclient_libs=
   case "$ndbcluster" in
     yes )
-      AC_MSG_RESULT([Using NDB Cluster])
+      AC_MSG_RESULT([Using NDB Cluster and Partitioning])
       AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
+      AC_DEFINE([HAVE_PARTITION_DB], [1], [Builds Partition DB])
       have_ndbcluster="yes"
-      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
-      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
+      ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"
+      ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
       ndbcluster_system_libs=""
-      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
+      ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
       MYSQL_CHECK_NDB_OPTIONS
       ;;
     * )
diff --git a/config/ac-macros/ha_partition.m4 b/config/ac-macros/ha_partition.m4
new file mode 100644
index 00000000000..ddec98530ce
--- /dev/null
+++ b/config/ac-macros/ha_partition.m4
@@ -0,0 +1,30 @@
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_PARTITIONDB
+dnl Sets HAVE_PARTITION_DB if --with-partition is used
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_CHECK_PARTITIONDB], [
+  AC_ARG_WITH([partition],
+              [
+  --with-partition
+                        Enable the Partition Storage Engine],
+              [partitiondb="$withval"],
+              [partitiondb=no])
+  AC_MSG_CHECKING([for partition])
+
+  case "$partitiondb" in
+    yes )
+      AC_DEFINE([HAVE_PARTITION_DB], [1], [Builds Partition DB])
+      AC_MSG_RESULT([yes])
+      [partitiondb=yes]
+      ;;
+    * )
+      AC_MSG_RESULT([no])
+      [partitiondb=no]
+      ;;
+  esac
+
+])
+dnl ---------------------------------------------------------------------------
+dnl END OF MYSQL_CHECK_PARTITION SECTION
+dnl ---------------------------------------------------------------------------
+