diff options
| author | unknown <serg@serg.mylan> | 2005-12-31 10:13:45 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-12-31 10:13:45 +0100 |
| commit | 85cf4646f248a154728fcd534f04e7a56fcf62bd (patch) | |
| tree | e0fe1d2dc91450a12bb60e8d9fda8bdc6eb5245a /configure.in | |
| parent | 565e729e384f268a042c9a9e72f85518b10b0dce (diff) | |
| download | mariadb-git-85cf4646f248a154728fcd534f04e7a56fcf62bd.tar.gz | |
libarchive.a and storage/archive/Makefile should be specified in
MYSQL_STORAGE_ENGINE macro (and nowhere else)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 0e58a871322..9e2a0748b0d 100644 --- a/configure.in +++ b/configure.in @@ -2439,8 +2439,10 @@ MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[ MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[ AC_CONFIG_FILES(storage/example/Makefile) ]) -MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive) -dnl MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o) +MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, + \$(top_builddir)/storage/archive/libarchive.a, [ + AC_CONFIG_FILES(storage/archive/Makefile) +]) MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[ AC_CONFIG_FILES(storage/csv/Makefile) ]) @@ -2565,7 +2567,6 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl storage/myisam/Makefile storage/myisammrg/Makefile dnl - storage/archive/Makefile dnl os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl man/Makefile BUILD/Makefile vio/Makefile dnl libmysql/Makefile client/Makefile dnl |