Navigation Menu

Skip to content

Commit

Permalink
deb rpm: link with libmysqlsevices for MySQL 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
kenhys committed Feb 26, 2013
1 parent bccff46 commit d23dd03
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile.am
Expand Up @@ -11,7 +11,11 @@ libraries = \
$(top_builddir)/lib/libmrn_no_mysql.la \
$(top_builddir)/lib/libmrn_need_mysql.la

if WITH_LIBMYSQLSERVICES
dynamic_plugin_ldflags = -module $(GROONGA_LIBS) -L$(plugindir)/.. -lmysqlservices
else
dynamic_plugin_ldflags = -module $(GROONGA_LIBS) -L$(plugindir)/..
endif
dynamic_plugin_cxxflags = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
dynamic_plugin_cflags = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN

Expand Down
10 changes: 10 additions & 0 deletions configure.ac
Expand Up @@ -168,6 +168,16 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)"
MYSQL_INCLUDES="$MYSQL_INCLUDES $($ac_mysql_config --include)"
MYSQL_VERSION="$($ac_mysql_config --version)"
MYSQL_MAJOR_MINOR_VERSION=`echo $MYSQL_VERSION | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)$/\1.\2/'`
case "$MYSQL_MAJOR_MINOR_VERSION" in
5.6*)
USE_LIBMYSQLSERVICES="yes"
;;
*)
USE_LIBMYSQLSERVICES="no"
;;
esac
AM_CONDITIONAL([WITH_LIBMYSQLSERVICES], [test "${USE_LIBMYSQLSERVICES}" != "no"])
])

m4_define([mrn_required_groonga_version], m4_include(required_groonga_version))
Expand Down

0 comments on commit d23dd03

Please sign in to comment.