diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-12 14:01:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-12 14:01:01 +0200 |
| commit | 4449d8e38053d55248b5c6485e6c5e442ac5ff1b (patch) | |
| tree | 77b410c565b513a6ec9a41893c158e24a288b8b6 /plugin | |
| parent | d418175f15e8bd67fe4e6a9d8160416885483dbd (diff) | |
| download | mariadb-git-4449d8e38053d55248b5c6485e6c5e442ac5ff1b.tar.gz | |
fix a compilation failure for perl Net::HandlerSocket module
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs | 5 | ||||
| -rw-r--r-- | plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.in (renamed from plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL) | 4 | ||||
| -rw-r--r-- | plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed | 2 | ||||
| -rw-r--r-- | plugin/handler_socket/plug.in | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs b/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs index 39f11e2780e..8e8d2520337 100644 --- a/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs +++ b/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs @@ -12,6 +12,11 @@ #include "ppport.h" +/* + below we'll include (indirectly) my_global.h, which defines + VERSION too. Undefine our VERSION here. +*/ +#undef VERSION #include "hstcpcli.hpp" #define DBG(x) diff --git a/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL b/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.in index 50c329db4b6..1a9b1444fb8 100644 --- a/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL +++ b/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.in @@ -11,8 +11,8 @@ WriteMakefile( AUTHOR => 'higuchi dot akira at dena dot jp>') : ()), CC => 'g++ -fPIC', LD => 'g++ -fPIC', - LIBS => ['-L../libhsclient -L../libhsclient/.libs -lhsclient'], + LIBS => ['-L@builddir@/../libhsclient -L@builddir@/../libhsclient/.libs -lhsclient'], DEFINE => '', - INC => '-I. -I../libhsclient', + INC => '-I. -I../libhsclient -I@builddir@/../libhsclient -I@top_builddir@/include', OPTIMIZE => '-g -O3 -Wall -Wno-unused', ); diff --git a/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed b/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed index 1b7649498d2..0d01bceb819 100644 --- a/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed +++ b/plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed @@ -13,7 +13,7 @@ WriteMakefile( LD => 'g++ -fPIC', LIBS => ['-lhsclient'], # e.g., '-lm' DEFINE => '', # e.g., '-DHAVE_SOMETHING' - INC => '-I. -I/usr/include/handlersocket', + INC => '-I. -I/usr/include/handlersocket -I/usr/include/mysql', OPTIMIZE => '-g -O3 -Wall -Wno-unused', # Un-comment this if you add C files to link with later: # OBJECT => '$(O_FILES)', # link all the C files too diff --git a/plugin/handler_socket/plug.in b/plugin/handler_socket/plug.in index 0a6c36ba39f..fd351dec98d 100644 --- a/plugin/handler_socket/plug.in +++ b/plugin/handler_socket/plug.in @@ -16,4 +16,5 @@ MYSQL_PLUGIN_ACTIONS(handlersocket, AC_SUBST(MYSQL_LIB) AC_SUBST(PLUGIN_DIR) AC_SUBST(HANDLERSOCKET_SUBDIRS) + AC_CONFIG_FILES(plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL) ]) |