Kouhei Sutou
null+****@clear*****
Sun May 12 16:11:18 JST 2013
Kouhei Sutou 2013-05-12 16:11:18 +0900 (Sun, 12 May 2013) New Revision: 0a1fc34b74f786539faa0d04a54357138c171bfb https://github.com/mroonga/mroonga/commit/0a1fc34b74f786539faa0d04a54357138c171bfb Message: Search libmysqlservices.a directory TODO: Do the same thing in CMakeLists.txt. Reported by Y.Kentaro. Thanks!!! Modified files: configure.ac Modified: configure.ac (+9 -1) =================================================================== --- configure.ac 2013-05-11 09:41:51 +0900 (686a01f) +++ configure.ac 2013-05-12 16:11:18 +0900 (3001b08) @@ -166,13 +166,21 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ 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*) + AC_MSG_CHECKING([for libmysqlservices.a directory]) pkglibdir="$($ac_mysql_config --variable=pkglibdir)" mysql_build_libservices_dir="${MYSQL_BUILD_DIR}/libservices" if test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then mysql_services_lib_dir="${mysql_build_libservices_dir}" else - mysql_services_lib_dir="${pkglibdir}" + if test -f "${pkglibdir}/libmysqlservices.a"; then + mysql_services_lib_dir="${pkglibdir}" + elif test -f "${pkglibdir}/mysql/libmysqlservices.a"; then + mysql_services_lib_dir="${pkglibdir}/mysql" + else + AC_MSG_ERROR([libmysqlservices.a is not found in <${pkglibdir}/> and <${pkglibdir}/mysql/>]) + fi fi + AC_MSG_RESULT([$mysql_services_lib_dir]) MYSQL_LIBS="$MYSQL_LIBS -L\"$mysql_services_lib_dir\" -lmysqlservices" ;; *) -------------- next part -------------- HTML����������������������������...Download