[Groonga-mysql-commit] mroonga/mroonga [master] rpm centos: specify correct directory for libmysqlservices

Back to archive index

HAYASHI Kentaro null+****@clear*****
Tue Mar 26 13:45:48 JST 2013


HAYASHI Kentaro	2013-03-26 13:45:48 +0900 (Tue, 26 Mar 2013)

  New Revision: 4efca5ebf2b56c222cccc7f33b5c5d003cdd25d8
  https://github.com/mroonga/mroonga/commit/4efca5ebf2b56c222cccc7f33b5c5d003cdd25d8

  Message:
    rpm centos: specify correct directory for libmysqlservices
    
    mroonga is linked with MySQL 5.6.x on CentOS 5.
    MySQL 5.6.x requires libmysqlservices and
    libmysqlservices is installed under /usr/lib64/mysql, not /usr/lib64.
    
    It is better to use `mysql_config --plugindir` because it returns
    /usr/lib64/mysql/plugin.

  Modified files:
    configure.ac

  Modified: configure.ac (+1 -2)
===================================================================
--- configure.ac    2013-03-25 23:12:46 +0900 (e3bed4d)
+++ configure.ac    2013-03-26 13:45:48 +0900 (d8d8c0d)
@@ -160,11 +160,10 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
   MYSQL_VERSION="$($ac_mysql_config --version)"
   AC_SUBST(MYSQL_VERSION)
 
-  mysql_libdirs=["$($ac_mysql_config --libs | sed -e 's/ *-l[^ ]*//g')"]
   MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1.\2/')"]
   case "$MYSQL_MAJOR_MINOR_VERSION" in
   5.6*)
-      MYSQL_LIBS="$mysql_libdirs -lmysqlservices"
+      MYSQL_LIBS="-L$plugindir/.. -lmysqlservices"
       ;;
   *)
       MYSQL_LIBS=""
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-mysql-commit mailing list
Back to archive index