Kouhei Sutou
null+****@clear*****
Tue Apr 23 15:47:15 JST 2013
Kouhei Sutou 2013-04-23 15:47:15 +0900 (Tue, 23 Apr 2013) New Revision: c0db3c58efed4e8a9648f9522687ab25495afc15 https://github.com/mroonga/mroonga/commit/c0db3c58efed4e8a9648f9522687ab25495afc15 Message: Share required groonga-normalizer-mysql version with all build systems Added files: required_groonga_normalizer_mysql_version Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+9 -1) =================================================================== --- CMakeLists.txt 2013-04-23 15:37:14 +0900 (cbd3e3a) +++ CMakeLists.txt 2013-04-23 15:47:15 +0900 (a29c6ca) @@ -40,6 +40,13 @@ file(READ ${MRN_SOURCE_DIR}/plugin_version MRN_PLUGIN_VERSION) file(READ ${MRN_SOURCE_DIR}/required_groonga_version REQUIRED_GROONGA_VERSION) string(STRIP "${REQUIRED_GROONGA_VERSION}" REQUIRED_GROONGA_VERSION) +file(READ + ${MRN_SOURCE_DIR}/required_groonga_normalizer_mysql_version + REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION) +string(STRIP + "${REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION}" + REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION) + set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}") include(${MRN_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) @@ -104,7 +111,8 @@ endif() include(FindPkgConfig) pkg_check_modules(GROONGA REQUIRED "groonga >= ${REQUIRED_GROONGA_VERSION}") -pkg_check_modules(GROONGA_NORMALIZER_MYSQL "groonga-normalizer-mysql >= 1.0.1") +pkg_check_modules(GROONGA_NORMALIZER_MYSQL + "groonga-normalizer-mysql >= ${REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION}") include_directories( "${PROJECT_BINARY_DIR}" Modified: configure.ac (+4 -1) =================================================================== --- configure.ac 2013-04-23 15:37:14 +0900 (6a284d6) +++ configure.ac 2013-04-23 15:47:15 +0900 (a1326ee) @@ -185,9 +185,12 @@ AC_DEFUN([CONFIG_OPTION_GROONGA],[ AC_SUBST(GROONGA_VERSION) ]) +m4_define([mrn_required_groonga_normalizer_mysql_version], + m4_include(required_groonga_normalizer_mysql_version)) +REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION=mrn_required_groonga_normalizer_mysql_version AC_DEFUN([CONFIG_OPTION_GROONGA_NORMALIZER_MYSQL], [ AC_MSG_CHECKING([for groonga-normalizer-mysql]) - PKG_CHECK_EXISTS([groonga-normalizer-mysql >= 1.0.1], + PKG_CHECK_EXISTS([groonga-normalizer-mysql >= ${REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION}], [WITH_GROONGA_NORMALIZER_MYSQL=yes], [WITH_GROONGA_NORMALIZER_MYSQL=no]) AC_MSG_RESULT($WITH_GROONGA_NORMALIZER_MYSQL) Added: required_groonga_normalizer_mysql_version (+1 -0) 100644 =================================================================== --- /dev/null +++ required_groonga_normalizer_mysql_version 2013-04-23 15:47:15 +0900 (7dea76e) @@ -0,0 +1 @@ +1.0.1 -------------- next part -------------- HTML����������������������������...下载
