diff options
| author | acurtis@xiphis.org <> | 2006-04-13 13:49:29 -0700 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2006-04-13 13:49:29 -0700 |
| commit | 4e11a4d94199c710b0c7d0bf547157c14c480f19 (patch) | |
| tree | 7d7b722a3af9812d173de1c5398f625484467670 /plugin/fulltext | |
| parent | b02463c15aea36ddcd5b4f7d0f5b4594b5c84f62 (diff) | |
| download | mariadb-git-4e11a4d94199c710b0c7d0bf547157c14c480f19.tar.gz | |
WL#3201
" Configure support for server plugins "
Diffstat (limited to 'plugin/fulltext')
| -rw-r--r-- | plugin/fulltext/Makefile.am | 47 | ||||
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 2 |
2 files changed, 42 insertions, 7 deletions
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index 4df5a1dc78a..331db7c98f8 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -1,9 +1,44 @@ #Makefile.am example for a plugin -pkglibdir=$(libdir)/mysql -INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include -noinst_LTLIBRARIES= mypluglib.la -#pkglib_LTLIBRARIES= mypluglib.la -mypluglib_la_SOURCES= plugin_example.c -mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir) +#MYSQL_MODULE(ftexample, [Simple Parser], +# [Simple full-text parser plugin]) +#MYSQL_MODULE_DIRECTORY(ftexample, [plugin/fulltext]) +#MYSQL_MODULE_STATIC(ftexample, [libftexample.a]) +#MYSQL_MODULE_DYNAMIC(ftexample, [ft_example.la]) + +#called from the top level Makefile + +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/sql \ + -I$(srcdir) +WRAPLIBS= + +LDADD = + +DEFS = @DEFS@ + +noinst_HEADERS = + +EXTRA_LTLIBRARIES = ft_example.la +pkglib_LTLIBRARIES = @plugin_ftexample_shared_target@ +ft_example_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ft_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ft_example_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ft_example_la_SOURCES = plugin_example.c + + +EXTRA_LIBRARIES = libftexample.a +noinst_LIBRARIES = @plugin_ftexample_static_target@ +libftexample_a_CXXFLAGS=$(AM_CFLAGS) +libftexample_a_CFLAGS = $(AM_CFLAGS) +libftexample_a_SOURCES= plugin_example.c + + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index cdf1527b310..9b937453ce4 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -216,7 +216,7 @@ static struct st_mysql_show_var simple_status[]= Plugin library descriptor */ -mysql_declare_plugin +mysql_declare_plugin(ftexample) { MYSQL_FTPARSER_PLUGIN, /* type */ &simple_parser_descriptor, /* descriptor */ |