]>
Commit | Line | Data |
---|---|---|
0eb559e1 ER |
1 | --- mysql-5.1.49/storage/sphinx/Makefile.am~ 2009-02-13 23:26:46.000000000 +0200 |
2 | +++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 16:35:57.568716704 +0300 | |
3 | @@ -31,7 +31,7 @@ | |
4 | LDADD = | |
5 | ||
6 | DEFS= @DEFS@ \ | |
7 | - -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DMYSQL_SERVER | |
8 | + -D_REENTRANT -D_PTHREADS -DSTORAGE_ENGINE -DMYSQL_SERVER | |
9 | ||
10 | noinst_HEADERS = ha_sphinx.h | |
11 | ||
45ca886f ER |
12 | --- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 16:37:48.000000000 +0300 |
13 | +++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-24 17:00:56.161565823 +0300 | |
14 | @@ -38,7 +38,7 @@ | |
15 | EXTRA_LTLIBRARIES = ha_sphinx.la | |
16 | pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la | |
17 | ||
18 | -ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) | |
19 | +ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
20 | ha_sphinx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
21 | ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
22 | ha_sphinx_la_SOURCES = ha_sphinx.cc | |
76a72d15 ER |
23 | --- mysql-5.1.49/storage/sphinx/Makefile.am~ 2010-07-24 19:14:55.000000000 +0300 |
24 | +++ mysql-5.1.49/storage/sphinx/Makefile.am 2010-07-25 03:47:56.660771099 +0300 | |
25 | @@ -43,7 +43,7 @@ | |
26 | ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
27 | ha_sphinx_la_SOURCES = ha_sphinx.cc | |
28 | ||
29 | -sphinx_la_LDFLAGS = -module | |
30 | +sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) | |
31 | sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
32 | sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN | |
33 | sphinx_la_SOURCES = snippets_udf.cc |