null+****@clear*****
null+****@clear*****
2012年 5月 20日 (日) 00:29:31 JST
Kouhei Sutou 2012-05-20 00:29:31 +0900 (Sun, 20 May 2012)
New Revision: a8b0450c10292bf7b85d0c184f426129b091c981
Log:
Require groonga 2.0.3
Added files:
required_groonga_version
Modified files:
CMakeLists.txt
configure.ac
Modified: CMakeLists.txt (+3 -1)
===================================================================
--- CMakeLists.txt 2012-05-20 00:26:42 +0900 (eacee5e)
+++ CMakeLists.txt 2012-05-20 00:29:31 +0900 (696847d)
@@ -24,6 +24,8 @@ file(READ ${CMAKE_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
file(READ ${CMAKE_SOURCE_DIR}/version_in_hex MRN_VERSION_IN_HEX)
file(READ ${CMAKE_SOURCE_DIR}/plugin_version MRN_PLUGIN_VERSION)
+file(READ ${CMAKE_SOURCE_DIR}/required_groonga_version REQUIRED_GROONGA_VERSION)
+
set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}")
include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
@@ -62,7 +64,7 @@ set_mysql_config_value("--cflags" MYSQL_CFLAGS)
set_mysql_config_value("--version" MYSQL_VERSION)
include(FindPkgConfig)
-pkg_check_modules(GROONGA REQUIRED "groonga >= 2.0.0")
+pkg_check_modules(GROONGA REQUIRED "groonga >= ${REQUIRED_GROONGA_VERSION}")
include_directories(
"${PROJECT_BINARY_DIR}"
Modified: configure.ac (+2 -1)
===================================================================
--- configure.ac 2012-05-20 00:26:42 +0900 (72e4109)
+++ configure.ac 2012-05-20 00:29:31 +0900 (435527a)
@@ -165,8 +165,9 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
AC_MSG_RESULT($mrn_mysql_innodb_fts_p)
])
+m4_define([mrn_required_groonga_version], m4_include(required_groonga_version))
AC_DEFUN([CONFIG_OPTION_GROONGA],[
- PKG_CHECK_MODULES(GROONGA, groonga >= 2.0.2)
+ PKG_CHECK_MODULES(GROONGA, groonga >= 2.0.3)
_PKG_CONFIG(GROONGA_VERSION, variable=groonga_version, groonga)
GROONGA_VERSION=$pkg_cv_GROONGA_VERSION
AC_SUBST(GROONGA_VERSION)
Added: required_groonga_version (+1 -0) 100644
===================================================================
--- /dev/null
+++ required_groonga_version 2012-05-20 00:29:31 +0900 (50ffc5a)
@@ -0,0 +1 @@
+2.0.3