null+****@clear*****
null+****@clear*****
2012年 3月 20日 (火) 15:31:36 JST
Kouhei Sutou 2012-03-20 15:31:36 +0900 (Tue, 20 Mar 2012) New Revision: a7a4c9e81dbcb128e548ebe69e06870216beb2b2 Log: Add _DIR suffix Modified files: config.sh.in configure.ac test/run-sql-test.sh Modified: config.sh.in (+2 -2) =================================================================== --- config.sh.in 2012-03-20 15:26:40 +0900 (0f6e403) +++ config.sh.in 2012-03-20 15:31:36 +0900 (75ee62f) @@ -14,6 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -MYSQL_SOURCE="@MYSQL_SOURCE@" -MYSQL_BUILD="@MYSQL_BUILD@" +MYSQL_SOURCE_DIR="@MYSQL_SOURCE_DIR@" +MYSQL_BUILD_DIR="@MYSQL_BUILD_DIR@" MYSQL_VERSION="@MYSQL_VERSION@" Modified: configure.ac (+4 -4) =================================================================== --- configure.ac 2012-03-20 15:26:40 +0900 (25491a2) +++ configure.ac 2012-03-20 15:31:36 +0900 (9bfd723) @@ -112,8 +112,8 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ ], [AC_MSG_ERROR([--with-mysql-source=PATH is required for standalone build])] ) - MYSQL_SOURCE="$ac_mysql_source_dir" - AC_SUBST(MYSQL_SOURCE) + MYSQL_SOURCE_DIR="$ac_mysql_source_dir" + AC_SUBST(MYSQL_SOURCE_DIR) ac_mysql_build_dir= AC_ARG_WITH([mysql-build], @@ -121,8 +121,8 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ [ac_mysql_build_dir="$withval"], [ac_mysql_build_dir="$ac_mysql_source_dir"] ) - MYSQL_BUILD="$ac_mysql_build_dir" - AC_SUBST(MYSQL_BUILD) + MYSQL_BUILD_DIR="$ac_mysql_build_dir" + AC_SUBST(MYSQL_BUILD_DIR) AC_MSG_CHECKING([mysql_config]) AC_ARG_WITH([mysql-config], Modified: test/run-sql-test.sh (+6 -6) =================================================================== --- test/run-sql-test.sh 2012-03-20 15:26:40 +0900 (bfe171c) +++ test/run-sql-test.sh 2012-03-20 15:31:36 +0900 (4d075b6) @@ -10,14 +10,14 @@ fi . "${top_dir}/config.sh" test_suite_names="mroonga_storage,mroonga_wrapper" -source_mysql_test_dir="${MYSQL_SOURCE}/mysql-test" -build_mysql_test_dir="${MYSQL_BUILD}/mysql-test" +source_mysql_test_dir="${MYSQL_SOURCE_DIR}/mysql-test" +build_mysql_test_dir="${MYSQL_BUILD_DIR}/mysql-test" source_test_suites_dir="${source_mysql_test_dir}/suite" build_test_suites_dir="${build_mysql_test_dir}/suite" build_test_include_dir="${build_mysql_test_dir}/include" case "${MYSQL_VERSION}" in 5.1.*) - plugins_dir="${MYSQL_BUILD}/lib/mysql/plugin" + plugins_dir="${MYSQL_BUILD_DIR}/lib/mysql/plugin" if ! test -d "${build_test_suites_dir}"; then mkdir -p "${build_test_suites_dir}" fi @@ -26,15 +26,15 @@ case "${MYSQL_VERSION}" in if ! test -d "${build_test_suites_dir}"; then ln -s "${source_test_suites_dir}" "${build_test_suites_dir}" fi - if ! test -d "${MYSQL_BUILD}/plugin/mroonga"; then - ln -s "${top_dir}" "${MYSQL_BUILD}/plugin/mroonga" + if ! test -d "${MYSQL_BUILD_DIR}/plugin/mroonga"; then + ln -s "${top_dir}" "${MYSQL_BUILD_DIR}/plugin/mroonga" fi ;; *) if ! test -d "${build_test_suites_dir}"; then ln -s "${source_test_suites_dir}" "${build_test_suites_dir}" fi - plugins_dir="${MYSQL_SOURCE}/lib/plugin" + plugins_dir="${MYSQL_SOURCE_DIR}/lib/plugin" ;; esac