Kouhei Sutou
null+****@clear*****
Tue Mar 26 16:56:48 JST 2013
Kouhei Sutou 2013-03-26 16:56:48 +0900 (Tue, 26 Mar 2013) New Revision: 521cbe9b70b5cc6d2070a903a56c9e5ca72f2ef4 https://github.com/mroonga/mroonga/commit/521cbe9b70b5cc6d2070a903a56c9e5ca72f2ef4 Message: test/run-sql-test.sh works on MariaDB bundled build Modified files: config.sh.in configure.ac test/run-sql-test.sh Modified: config.sh.in (+1 -0) =================================================================== --- config.sh.in 2013-03-26 16:54:40 +0900 (75ee62f) +++ config.sh.in 2013-03-26 16:56:48 +0900 (2b584c6) @@ -17,3 +17,4 @@ MYSQL_SOURCE_DIR="@MYSQL_SOURCE_DIR@" MYSQL_BUILD_DIR="@MYSQL_BUILD_DIR@" MYSQL_VERSION="@MYSQL_VERSION@" +MRN_BUNDLED="@MRN_BUNDLED@" Modified: configure.ac (+3 -0) =================================================================== --- configure.ac 2013-03-26 16:54:40 +0900 (d8d8c0d) +++ configure.ac 2013-03-26 16:56:48 +0900 (6a284d6) @@ -28,6 +28,9 @@ AC_SUBST([MRN_PLUGIN_VERSION]) MRN_PACKAGE_STRING="$PACKAGE_STRING" AC_SUBST([MRN_PACKAGE_STRING]) +MRN_BUNDLED=FALSE +AC_SUBST([MRN_BUNDLED]) + AC_C_BIGENDIAN AC_PROG_CC AC_PROG_CXX Modified: test/run-sql-test.sh (+3 -1) =================================================================== --- test/run-sql-test.sh 2013-03-26 16:54:40 +0900 (5c59a56) +++ test/run-sql-test.sh 2013-03-26 16:56:48 +0900 (bc2cb03) @@ -49,7 +49,9 @@ case "${MYSQL_VERSION}" in mariadb="no" fi if [ "${mariadb}" = "yes" ]; then - ln -s "${top_dir}" "${MYSQL_BUILD_DIR}/plugin/mroonga" + if [ "${MRN_BUNDLED}" != "TRUE" ]; then + ln -s "${top_dir}" "${MYSQL_BUILD_DIR}/plugin/mroonga" + fi plugins_dir= else plugins_dir="${MYSQL_SOURCE_DIR}/lib/plugin" -------------- next part -------------- HTML����������������������������...ダウンロード
