Commit f2a317b6 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.0-main into 5.0-bugteam

parents d21c8503 b781b3fa

configure.in

+3 −1
Original line number Diff line number Diff line
@@ -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"