diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
| commit | 95b37a254b0797499b4a940ca8eb8fa907a7664f (patch) | |
| tree | bcd57843b07d10746160f485e039446bf4bd616e /storage/sphinx | |
| parent | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff) | |
| parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
| download | mariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz | |
Merge MariaDB 5.1->5.2
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/Makefile.am | 11 | ||||
| -rw-r--r-- | storage/sphinx/plug.in | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/storage/sphinx/Makefile.am b/storage/sphinx/Makefile.am index 5f58d673547..6f9c7bc1ae2 100644 --- a/storage/sphinx/Makefile.am +++ b/storage/sphinx/Makefile.am @@ -30,7 +30,7 @@ DEFS= @DEFS@ -D_REENTRANT -D_PTHREADS -DMYSQL_SERVER noinst_HEADERS = ha_sphinx.h -EXTRA_LTLIBRARIES = ha_sphinx.la +EXTRA_LTLIBRARIES = libsphinx.la ha_sphinx.la pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \ @@ -44,11 +44,10 @@ sphinx_la_CXXFLAGS = $(AM_CFLAGS) sphinx_la_CFLAGS = $(AM_CFLAGS) sphinx_la_SOURCES = snippets_udf.cc -EXTRA_LIBRARIES = libsphinx.a -noinst_LIBRARIES = @plugin_sphinx_static_target@ -libsphinx_a_CXXFLAGS = $(AM_CFLAGS) -libsphinx_a_CFLAGS = $(AM_CFLAGS) -libsphinx_a_SOURCES= ha_sphinx.cc +noinst_LTLIBRARIES = @plugin_sphinx_static_target@ +libsphinx_la_CXXFLAGS = $(AM_CFLAGS) +libsphinx_la_CFLAGS = $(AM_CFLAGS) +libsphinx_la_SOURCES= ha_sphinx.cc EXTRA_DIST = CMakeLists.txt # Don't update the files from bitkeeper diff --git a/storage/sphinx/plug.in b/storage/sphinx/plug.in index 6c96e41ae52..2c07584465e 100644 --- a/storage/sphinx/plug.in +++ b/storage/sphinx/plug.in @@ -1,6 +1,6 @@ MYSQL_STORAGE_ENGINE(sphinx,,[Sphinx Storage Engine], [SE client for Sphinx search daemon], []) MYSQL_PLUGIN_DIRECTORY(sphinx, [storage/sphinx]) -MYSQL_PLUGIN_STATIC(sphinx, [libsphinx.a]) +MYSQL_PLUGIN_STATIC(sphinx, [libsphinx.la]) MYSQL_PLUGIN_DYNAMIC(sphinx, [ha_sphinx.la]) |