summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2008-08-27 16:25:24 +0200
committerJoerg Bruehe <joerg@mysql.com>2008-08-27 16:25:24 +0200
commit1c855bc1f18b96357ff195fa1a5424b5ec9454ec (patch)
tree38242cc0177dae7fa062af1bac51558fca49aa3f /configure.in
parenta4b0681ad19cea6c506024690aaddbe13f7d3a03 (diff)
parent7077649ef1a6201ba7f2c5792e8935ea0b4689cf (diff)
downloadmariadb-git-1c855bc1f18b96357ff195fa1a5424b5ec9454ec.tar.gz
Merge the bug fix development (37098: "unpackaged files")
into the 5.0 team tree.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index bd993bb5fcf..c51b9116873 100644
--- a/configure.in
+++ b/configure.in
@@ -2810,6 +2810,9 @@ EOF
AC_CONFIG_SUBDIRS(innobase)
fi
+ # "innochecksum" is not in the "innobase/" subdirectory, but should be switched
+ AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes])
+
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
*solaris*-i?86-no-yes)
if $CC -xildon 2>&1 | grep "illegal option" >/dev/null