diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-19 14:34:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-19 14:34:40 +0200 |
| commit | b315c62bf1fa5fd5ca9a28d7a57b25d16c9d0572 (patch) | |
| tree | 96a70666bf604874998eb0656d6d416aecd778c6 /plugin | |
| parent | a51fccc8dd623202925655dcf495c2af87c7d4d6 (diff) | |
| download | mariadb-git-b315c62bf1fa5fd5ca9a28d7a57b25d16c9d0572.tar.gz | |
lp:730035 Handlersocket does not load
-fimplicit-termplates must be in CXXFLAGS not in handlersocket_la_CXXFLAGS.
otehrwise automake puts it in the command line too early to override
global -fno-implicit-templates
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/handler_socket/handlersocket/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/handler_socket/handlersocket/Makefile.am b/plugin/handler_socket/handlersocket/Makefile.am index e00b7bc4ea4..4d75d9739b1 100644 --- a/plugin/handler_socket/handlersocket/Makefile.am +++ b/plugin/handler_socket/handlersocket/Makefile.am @@ -1,7 +1,8 @@ pkgplugindir = $(PLUGIN_DIR) +CXXFLAGS += -fimplicit-templates noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp pkgplugin_LTLIBRARIES = handlersocket.la handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la -handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient +handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ hstcpsvr_worker.cpp hstcpsvr.cpp |