diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
| commit | fa780d44c64df04bb78d097e984b40fdf11edc84 (patch) | |
| tree | 6724cacb8e05bc9947fee00d5a2dd6c47605ce66 /configure.in | |
| parent | 73970addd82584a9ec6ad4c95ba5d54dfe0f640c (diff) | |
| parent | 421ae80b0ccbfa33856fe1f079bc3cd6acf44175 (diff) | |
| download | mariadb-git-fa780d44c64df04bb78d097e984b40fdf11edc84.tar.gz | |
Manual merge.
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 1140048d8e5..3dfbe913727 100644 --- a/configure.in +++ b/configure.in @@ -2620,7 +2620,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl zlib/Makefile dnl cmd-line-utils/readline/Makefile dnl plugin/Makefile dnl - plugin/fulltext/Makefile) + plugin/fulltext/Makefile dnl + win/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_OUTPUT |