1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge to mysql-5.0-bugteam

Browse Source
This commit is contained in:
Jonathan Perkin 2009-10-02 13:54:38 +01:00
commit 79b438cb98
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
win/configure.js
View File

@ -41,7 +41,6 @@ try
{ {
case "WITH_COMMUNITY_FEATURES": case "WITH_COMMUNITY_FEATURES":
case "WITH_ARCHIVE_STORAGE_ENGINE": case "WITH_ARCHIVE_STORAGE_ENGINE":
case "WITH_BERKELEY_STORAGE_ENGINE":
case "WITH_BLACKHOLE_STORAGE_ENGINE": case "WITH_BLACKHOLE_STORAGE_ENGINE":
case "WITH_EXAMPLE_STORAGE_ENGINE": case "WITH_EXAMPLE_STORAGE_ENGINE":
case "WITH_FEDERATED_STORAGE_ENGINE": case "WITH_FEDERATED_STORAGE_ENGINE":
@ -51,6 +50,21 @@ try
case "EMBED_MANIFESTS": case "EMBED_MANIFESTS":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break; 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 "MYSQL_SERVER_SUFFIX":
case "MYSQLD_EXE_SUFFIX": case "MYSQLD_EXE_SUFFIX":
configfile.WriteLine("SET (" + parts[0] + " \"" configfile.WriteLine("SET (" + parts[0] + " \""