merged 5.0-main into 5.0-bugteam

This commit is contained in:
Georgi Kodinov 2008-12-01 16:56:56 +02:00
commit f2a317b663

View File

@ -2728,8 +2728,10 @@ then
AC_SUBST(THREAD_LOBJECTS)
fi
if test "$with_server" != "no"
if test "$with_server" = "no"
then
AM_CONDITIONAL([BUILD_INNODB_TOOLS], [false])
else
server_scripts="mysqld_safe mysql_install_db"
sql_server_dirs="strings mysys dbug extra regex"