diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-09-10 19:35:11 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-09-10 19:35:11 -0600 |
| commit | 31a620089ac0475ba70ac30b6489f58b29927912 (patch) | |
| tree | af062b910ac75fea9867b300492fd274c33e389d /extra | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| parent | ee5d0dd94f3804983376c7a5dbc67cf802047908 (diff) | |
| download | mariadb-git-31a620089ac0475ba70ac30b6489f58b29927912.tar.gz | |
Auto merge 5.1-build -> 5.1-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 bc7289c7f7d..75422c4ee11 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -43,7 +43,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 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_PROGRAMS = comp_err EXTRA_DIST = CMakeLists.txt |