Commit 16b41f10 authored by Jonathan Perkin's avatar Jonathan Perkin

bug#27693: Windows compilation from bk fails using WITH_BERKELEY_STORAGE_ENGINE

Make configure.js bail with an error if trying to build bdb from a bzr
tree.
parent f4d20df9
......@@ -41,7 +41,6 @@ try
{
case "WITH_COMMUNITY_FEATURES":
case "WITH_ARCHIVE_STORAGE_ENGINE":
case "WITH_BERKELEY_STORAGE_ENGINE":
case "WITH_BLACKHOLE_STORAGE_ENGINE":
case "WITH_EXAMPLE_STORAGE_ENGINE":
case "WITH_FEDERATED_STORAGE_ENGINE":
......@@ -51,6 +50,21 @@ try
case "EMBED_MANIFESTS":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break;
// BDB includes auto-generated files which are not handled by
// cmake, so only allow this option if building from a source
// distribution
case "WITH_BERKELEY_STORAGE_ENGINE":
if (!fso.FileExists("bdb\\btree\\btree_auto.c"))
{
BDBSourceError = new Error("BDB cannot be built directly" +
" from a bzr tree, see comment in bdb\\CMakeLists.txt");
throw BDBSourceError;
}
else
{
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break;
}
case "MYSQL_SERVER_SUFFIX":
case "MYSQLD_EXE_SUFFIX":
configfile.WriteLine("SET (" + parts[0] + " \""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment