summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2008-10-24 17:34:17 +0200
committerJoerg Bruehe <joerg@mysql.com>2008-10-24 17:34:17 +0200
commitb1f396227669531e81d443395822f7a395c789ca (patch)
treea63f46b6c942321200395fe5d1a9f6f21305a099
parent5bc2ad279d7f35100b4f580045f2c646e9a8b90b (diff)
downloadmariadb-git-b1f396227669531e81d443395822f7a395c789ca.tar.gz
Fix a "configure" syntax error.
It had been introduced with the patch for bug entry 37098 and affected runs "--without-server" only. configure.in: The conditional "BUILD_INNODB_TOOLS" is set depending on whether InnoDB is configured in the build, but that check is done only when building the server. For builds without the server it must also be set, or else "configure" reports an error. Set it to "false" in such builds, as this conditional only affects a tool that is useless in client installations.
-rw-r--r--configure.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 85021ba8dde..f48f1544677 100644
--- a/configure.in
+++ b/configure.in
@@ -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"