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 | fb2c9d8232d62d7a1e1491fc9e34826ebd6739d9 (patch) | |
| tree | af062b910ac75fea9867b300492fd274c33e389d /extra | |
| parent | 772cdf0000b3eb99ce3c91ad8b1a8765d7bf5b74 (diff) | |
| parent | 09ea0a5b24e8457094d60841ac7192b43e3b523e (diff) | |
| download | mariadb-git-fb2c9d8232d62d7a1e1491fc9e34826ebd6739d9.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 |