Commit 85cf4646 authored by unknown's avatar unknown
Browse files

libarchive.a and storage/archive/Makefile should be specified in 

MYSQL_STORAGE_ENGINE macro (and nowhere else)
parent 565e729e

configure.in

+4 −3
Original line number Diff line number Diff line
@@ -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

sql/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ bin_PROGRAMS = mysql_tzinfo_to_sql 
gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@

LDADD =			$(top_builddir)/storage/myisam/libmyisam.a \

			$(top_builddir)/storage/myisammrg/libmyisammrg.a \

			$(top_builddir)/storage/archive/libarchive.a \

			$(top_builddir)/storage/heap/libheap.a \

			$(top_builddir)/vio/libvio.a \

			$(top_builddir)/mysys/libmysys.a \