diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-09-10 19:34:17 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-09-10 19:34:17 -0600 |
| commit | cafa5594d37995c2dcd5d20b7d5b8155b3fff166 (patch) | |
| tree | c843961cd0cff8a1450e7ce9528564e0ca7d0dad /extra | |
| parent | bed8cec4854c3a4447961f389a2ff602374c9107 (diff) | |
| parent | 92d3010dc1bb4b20c020f7e41850fdebf9cb05c2 (diff) | |
| download | mariadb-git-cafa5594d37995c2dcd5d20b7d5b8155b3fff166.tar.gz | |
Auto merge 5.0-build -> 5.0-bugteam
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 6eac67e2979..16567f8d613 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -45,7 +45,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ - resolve_stack_dump mysql_waitpid innochecksum + resolve_stack_dump mysql_waitpid +# "innochecksum" should be switched +if BUILD_INNODB_TOOLS +bin_PROGRAMS += innochecksum +endif + noinst_PROGRAMS = charset2html EXTRA_DIST = CMakeLists.txt |