Kouhei Sutou
null+****@clear*****
Sun Apr 29 15:12:51 JST 2018
Kouhei Sutou 2018-04-29 15:12:51 +0900 (Sun, 29 Apr 2018) New Revision: 5d2fc5be94bcf15050497bf66f9c7a352c897bcd https://github.com/mroonga/mroonga/commit/5d2fc5be94bcf15050497bf66f9c7a352c897bcd Message: mysql8.0: follow .a output directory change Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+6 -2) =================================================================== --- CMakeLists.txt 2018-04-29 15:04:50 +0900 (a3df4c9d) +++ CMakeLists.txt 2018-04-29 15:12:51 +0900 (edfed001) @@ -1,6 +1,6 @@ # -*- indent-tabs-mode: nil -*- # -# Copyright(C) 2012-2017 Kouhei Sutou <kou �� clear-code.com> +# Copyright(C) 2012-2018 Kouhei Sutou <kou �� clear-code.com> # Copyright(C) 2013 Kentoku SHIBA # # This library is free software; you can redistribute it and/or @@ -259,7 +259,11 @@ else() set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR) set_mysql_config_value("--variable=pkglibdir" MYSQL_PKG_LIB_DIR) set(MYSQL_SERVICES_LIB_STATIC - "${MYSQL_BUILD_DIR}/libservices/libmysqlservices.a") + "${MYSQL_BUILD_DIR}/archive_output_directory/libmysqlservices.a") + if(NOT EXISTS "${MYSQL_SERVICES_LIB_STATIC}") + set(MYSQL_SERVICES_LIB_STATIC + "${MYSQL_BUILD_DIR}/libservices/libmysqlservices.a") + endif() if(NOT EXISTS "${MYSQL_SERVICES_LIB_STATIC}") set(MYSQL_SERVICES_LIB_STATIC "${MYSQL_PKG_LIB_DIR}/libmysqlservices.a") endif() Modified: configure.ac (+4 -1) =================================================================== --- configure.ac 2018-04-29 15:04:50 +0900 (47d4d012) +++ configure.ac 2018-04-29 15:12:51 +0900 (9515d141) @@ -225,8 +225,11 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ *) AC_MSG_CHECKING([for libmysqlservices.a directory]) pkglibdir="$($ac_mysql_config --variable=pkglibdir)" + mysql_build_archive_output_dir="${MYSQL_BUILD_DIR}/archive_output_directory" mysql_build_libservices_dir="${MYSQL_BUILD_DIR}/libservices" - if test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then + if test -f "${mysql_build_archive_output_dir}/libmysqlservices.a"; then + mysql_services_lib_dir="${mysql_build_archive_output_dir}" + elif test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then mysql_services_lib_dir="${mysql_build_libservices_dir}" else if test -f "${pkglibdir}/libmysqlservices.a"; then -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180429/98de35d8/attachment-0001.htm
