libarchive.a and storage/archive/Makefile should be specified in
MYSQL_STORAGE_ENGINE macro (and nowhere else)
This commit is contained in:
parent
565e729e38
commit
85cf4646f2
@ -2439,8 +2439,10 @@ MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[
|
|||||||
MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[
|
MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[
|
||||||
AC_CONFIG_FILES(storage/example/Makefile)
|
AC_CONFIG_FILES(storage/example/Makefile)
|
||||||
])
|
])
|
||||||
MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive)
|
MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,
|
||||||
dnl MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o)
|
\$(top_builddir)/storage/archive/libarchive.a, [
|
||||||
|
AC_CONFIG_FILES(storage/archive/Makefile)
|
||||||
|
])
|
||||||
MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[
|
MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[
|
||||||
AC_CONFIG_FILES(storage/csv/Makefile)
|
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
|
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
|
||||||
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
|
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
|
||||||
storage/myisam/Makefile storage/myisammrg/Makefile dnl
|
storage/myisam/Makefile storage/myisammrg/Makefile dnl
|
||||||
storage/archive/Makefile dnl
|
|
||||||
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
|
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
|
||||||
man/Makefile BUILD/Makefile vio/Makefile dnl
|
man/Makefile BUILD/Makefile vio/Makefile dnl
|
||||||
libmysql/Makefile client/Makefile dnl
|
libmysql/Makefile client/Makefile dnl
|
||||||
|
@ -32,7 +32,6 @@ bin_PROGRAMS = mysql_tzinfo_to_sql
|
|||||||
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
||||||
LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
|
LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
|
||||||
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
||||||
$(top_builddir)/storage/archive/libarchive.a \
|
|
||||||
$(top_builddir)/storage/heap/libheap.a \
|
$(top_builddir)/storage/heap/libheap.a \
|
||||||
$(top_builddir)/vio/libvio.a \
|
$(top_builddir)/vio/libvio.a \
|
||||||
$(top_builddir)/mysys/libmysys.a \
|
$(top_builddir)/mysys/libmysys.a \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user