diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
| commit | 0ceeeafe85316e594d8ba42a6d0c3c29201944bf (patch) | |
| tree | 1d77daf398f43cbe5998ff4f0676165e6808927c /configure.in | |
| parent | 7a9f2e57e3325a56434704e9ba9fc4f424678a0b (diff) | |
| parent | 4836199d701af05a9c89563b642c51ee5640e804 (diff) | |
| download | mariadb-git-0ceeeafe85316e594d8ba42a6d0c3c29201944bf.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- mysql-test/r/mysqld--help-notwin.result
- mysql-test/r/mysqld--help-win.result
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 9776fc12fe6..3280c979c8c 100644 --- a/configure.in +++ b/configure.in @@ -3141,7 +3141,9 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl mysql-test/Makefile mysql-test/lib/My/SafeProcess/Makefile dnl netware/Makefile sql-bench/Makefile dnl - include/mysql_version.h plugin/Makefile win/Makefile) + include/mysql_version.h plugin/Makefile win/Makefile + cmake/Makefile + ) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) |