diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | config/ac-macros/storage.m4 | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | storage/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/csv/Makefile.am | 3 | ||||
| -rw-r--r-- | storage/example/Makefile.am | 3 |
6 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index e78a762af53..5d7de33cc42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @thread_dirs@ pstack \ @sql_union_dirs@ @mysql_se_dirs@ \ @sql_server@ scripts @man_dirs@ tests \ + @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ diff --git a/config/ac-macros/storage.m4 b/config/ac-macros/storage.m4 index cfca6f97a0c..8564e8ef5cc 100644 --- a/config/ac-macros/storage.m4 +++ b/config/ac-macros/storage.m4 @@ -40,9 +40,11 @@ then mysql_se_decls="${mysql_se_decls},$6" mysql_se_htons="${mysql_se_htons},&$6" mysql_se_objs="$mysql_se_objs $8" + mysql_se_dirs="$mysql_se_dirs $7" + mysql_se_libs="$mysql_se_libs $9" +else + mysql_se_plugins="$mysql_se_plugins $7" fi -mysql_se_dirs="$mysql_se_dirs $7" -mysql_se_libs="$mysql_se_libs $9" $10 fi ]) diff --git a/configure.in b/configure.in index 9b9939fecc0..848b41269ea 100644 --- a/configure.in +++ b/configure.in @@ -2520,6 +2520,7 @@ AC_SUBST(mysql_se_libs) AC_SUBST(mysql_se_objs) AC_SUBST(mysql_se_htons) AC_SUBST(mysql_se_decls) +AC_SUBST(mysql_se_plugins) # Now that sql_client_dirs and sql_server_dirs are stable, determine the union. diff --git a/storage/Makefile.am b/storage/Makefile.am index d3df68449ca..7b6f50b4f33 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = SUBDIRS = -DIST_SUBDIRS = . bdb heap innobase myisam myisammrg ndb +DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am index df7749b599c..1d3c47bd650 100644 --- a/storage/csv/Makefile.am +++ b/storage/csv/Makefile.am @@ -26,9 +26,6 @@ INCLUDES = -I$(top_srcdir)/include \ -I$(srcdir) WRAPLIBS= -$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy - ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc ) - pkglib_LTLIBRARIES = ha_csv.la ha_csv_la_LDFLAGS = -module diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index ad97866d73a..d5896946c5b 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -26,9 +26,6 @@ INCLUDES = -I$(top_srcdir)/include \ -I$(srcdir) WRAPLIBS= -$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy - ( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc ) - pkglib_LTLIBRARIES = ha_example.la ha_example_la_LDFLAGS = -module |