HAYASHI Kentaro
null+****@clear*****
Tue Feb 26 14:35:31 JST 2013
HAYASHI Kentaro 2013-02-26 14:35:31 +0900 (Tue, 26 Feb 2013) New Revision: d23dd03aba1bb9ffaf6d41bee29f146c82dfedaa https://github.com/mroonga/mroonga/commit/d23dd03aba1bb9ffaf6d41bee29f146c82dfedaa Log: deb rpm: link with libmysqlsevices for MySQL 5.6 Modified files: Makefile.am configure.ac Modified: Makefile.am (+4 -0) =================================================================== --- Makefile.am 2013-02-25 23:31:53 +0900 (6a1fc02) +++ Makefile.am 2013-02-26 14:35:31 +0900 (5371dcf) @@ -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 Modified: configure.ac (+10 -0) =================================================================== --- configure.ac 2013-02-25 23:31:53 +0900 (46d229b) +++ configure.ac 2013-02-26 14:35:31 +0900 (f58b4c6) @@ -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)) -------------- next part -------------- HTML����������������������������...Download