Kouhei Sutou
null+****@clear*****
Mon Mar 25 22:31:56 JST 2013
Kouhei Sutou 2013-03-25 22:31:56 +0900 (Mon, 25 Mar 2013) New Revision: 9e3ad97877051b44f3d4799b4610470580d1d516 https://github.com/mroonga/mroonga/commit/9e3ad97877051b44f3d4799b4610470580d1d516 Message: Compute required MySQL related library parameters in configure -L$(plugindir)/.. is ad-hook way to detect library location. Modified files: Makefile.am configure.ac Modified: Makefile.am (+1 -4) =================================================================== --- Makefile.am 2013-03-25 21:59:08 +0900 (3512da1) +++ Makefile.am 2013-03-25 22:31:56 +0900 (20a1512) @@ -11,10 +11,7 @@ libraries = \ $(top_builddir)/lib/libmrn_no_mysql.la \ $(top_builddir)/lib/libmrn_need_mysql.la -dynamic_plugin_ldflags = -module $(GROONGA_LIBS) -if WITH_LIBMYSQLSERVICES -dynamic_plugin_ldflags += -L$(plugindir)/.. -lmysqlservices -endif +dynamic_plugin_ldflags = -module $(GROONGA_LIBS) $(MYSQL_LIBS) dynamic_plugin_cxxflags = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN dynamic_plugin_cflags = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN Modified: configure.ac (+5 -3) =================================================================== --- configure.ac 2013-03-25 21:59:08 +0900 (5a8d4d8) +++ configure.ac 2013-03-25 22:31:56 +0900 (acb4557) @@ -169,15 +169,17 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ MYSQL_INCLUDES="$MYSQL_INCLUDES $($ac_mysql_config --include)" MYSQL_VERSION="$($ac_mysql_config --version)" MYSQL_MAJOR_MINOR_VERSION=`echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1.\2/'` + + mysql_libdirs=["$($ac_mysql_config --libs | sed -e 's/ *-l[^ ]*//g')"] case "$MYSQL_MAJOR_MINOR_VERSION" in 5.6*) - USE_LIBMYSQLSERVICES="yes" + MYSQL_LIBS="$mysql_libdirs -lmysqlservices" ;; *) - USE_LIBMYSQLSERVICES="no" + MYSQL_LIBS="" ;; esac - AM_CONDITIONAL([WITH_LIBMYSQLSERVICES], [test "${USE_LIBMYSQLSERVICES}" = "yes"]) + AC_SUBST(MYSQL_LIBS) ]) m4_define([mrn_required_groonga_version], m4_include(required_groonga_version)) -------------- next part -------------- HTML����������������������������...다운로드
