diff options
| author | unknown <acurtis@xiphis.org> | 2006-03-29 17:31:59 -0800 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-03-29 17:31:59 -0800 |
| commit | 55e0e30c4939ebec35fdb4ca9cde086e2ac478c0 (patch) | |
| tree | 1bcf6849d0332bce7511cc1213eed012fcf5dcb7 /configure.in | |
| parent | fa24633f6b153bbaeb8841baac88f77b2519b1f8 (diff) | |
| parent | fded4bdf77cc445c2f9447ee924dfb2cda5cffad (diff) | |
| download | mariadb-git-55e0e30c4939ebec35fdb4ca9cde086e2ac478c0.tar.gz | |
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into xiphis.org:/home/antony/work2/p1-bug18464
configure.in:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/example/Makefile.am:
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 3dfbe913727..0253a3a6771 100644 --- a/configure.in +++ b/configure.in @@ -2465,7 +2465,8 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[ MYSQL_SETUP_BERKELEY_DB ]) -MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[ +MYSQL_STORAGE_ENGINE(example,,,,,,storage/example,no, + \$(top_builddir)/storage/example/libexample.a,[ AC_CONFIG_FILES(storage/example/Makefile) ]) MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, |