diff options
author | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
commit | 8543621fa0f4a3c4102ac8f799888ef79e2e1dcf (patch) | |
tree | 29e8f301ef929cfe1c00eec9dee265aa0acaa350 /plugin | |
parent | f458e198c0bea67c6a3787738108bbfb139639bd (diff) | |
parent | bcee6652c6052cabd67f8d30c14e162235749d38 (diff) | |
download | mariadb-git-8543621fa0f4a3c4102ac8f799888ef79e2e1dcf.tar.gz |
Merge with 5.3 main
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/handler_socket/libhsclient/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugin/handler_socket/libhsclient/Makefile.am b/plugin/handler_socket/libhsclient/Makefile.am index d6409ef42ee..343b41860b3 100644 --- a/plugin/handler_socket/libhsclient/Makefile.am +++ b/plugin/handler_socket/libhsclient/Makefile.am @@ -8,6 +8,5 @@ inst_HEADERS = allocator.hpp config.hpp mutex.hpp string_util.hpp \ lib_LTLIBRARIES = libhsclient.la libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \ socket.cpp string_util.cpp -#libhsclient_la_LDFLAGS = -static libhsclient_la_CFLAGS = $(AM_CFLAGS) libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS) |