Kouhei Sutou
null+****@clear*****
Wed Nov 13 12:17:52 JST 2013
Kouhei Sutou 2013-11-13 12:17:52 +0900 (Wed, 13 Nov 2013) New Revision: 2f10768478a0466c92445887205dbe3a97d402a8 https://github.com/mroonga/mroonga/commit/2f10768478a0466c92445887205dbe3a97d402a8 Message: mariadb10.0.5: follow regular expression engine directory name change Regular expresssion engine directory is changed since MariaDB 10.0.5: regex/ -> pcre/ fixes #2066 Reported by Kazuhiko Shiozaki. Thanks!!! Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+7 -1) =================================================================== --- CMakeLists.txt 2013-11-12 18:25:35 +0900 (57bea8e) +++ CMakeLists.txt 2013-11-13 12:17:52 +0900 (1676676) @@ -103,11 +103,17 @@ else() endif() find_path(MYSQL_CONFIG "${MYSQL_CONFIG}") +if(EXISTS "${MYSQL_SOURCE_DIR}/pcre") + set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/pcre") +else() + set(MYSQL_REGEX_INCLUDE_DIR "${MYSQL_SOURCE_DIR}/regex") +endif() + set(MYSQL_INCLUDE_DIRS "${MYSQL_BUILD_DIR}/include" "${MYSQL_SOURCE_DIR}/sql" "${MYSQL_SOURCE_DIR}/include" - "${MYSQL_SOURCE_DIR}/regex" + "${MYSQL_REGEX_INCLUDE_DIR}" "${MYSQL_SOURCE_DIR}" CACHE INTERNAL "MySQL include directories") Modified: configure.ac (+6 -1) =================================================================== --- configure.ac 2013-11-12 18:25:35 +0900 (9c74842) +++ configure.ac 2013-11-13 12:17:52 +0900 (1673212) @@ -166,7 +166,12 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_build_dir/include" MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/sql" MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/include" - MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/regex" + if test -d "$ac_mysql_source_dir/pcre"; then + mysql_regex_include_dir="$ac_mysql_source_dir/pcre" + else + mysql_regex_include_dir="$ac_mysql_source_dir/regex" + fi + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_regex_include_dir" MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir" MYSQL_INCLUDES="$MYSQL_INCLUDES $($ac_mysql_config --include)" AC_SUBST(MYSQL_INCLUDES) -------------- next part -------------- HTML����������������������������...다운로드
