summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2008-08-27 16:03:39 +0200
committerJoerg Bruehe <joerg@mysql.com>2008-08-27 16:03:39 +0200
commit4120228e12fd53e0677d3ba803e6801f5c828969 (patch)
tree77d1b65db88cd4baa07ab38631578f6c5cfec1a5 /configure.in
parenta3cd2e2dab67a8d4abbd3c13e2455296a3304c56 (diff)
parent7077649ef1a6201ba7f2c5792e8935ea0b4689cf (diff)
downloadmariadb-git-4120228e12fd53e0677d3ba803e6801f5c828969.tar.gz
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Merge it up from 5.0 to 5.1, adapt to some version differences. configure.in: Add an "automake condition" whether InnoDB is configured so that we can evaluate it for the (non)generation of "innochecksum". In 5.1, the test command must differ from 5.0.
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 56bdb4ba006..9f6b99de9f9 100644
--- a/configure.in
+++ b/configure.in
@@ -2722,6 +2722,9 @@ then
sql_server="vio sql"
fi
+# "innochecksum" is not in the "innobase/" subdirectory, but should be switched
+AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])
+
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
# I know to add the static NSS magic if we have static NSS libraries with
# glibc - Sasha