Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:58:50 JST 2012
Kouhei Sutou 2012-05-24 17:13:18 +0900 (Thu, 24 May 2012) New Revision: ea9da8a1221c1efb494118116f84d7d89099355b https://github.com/mroonga/mroonga/commit/ea9da8a1221c1efb494118116f84d7d89099355b Log: debian: share required groonga version Modified files: .gitignore configure.ac Renamed files: packages/debian/control.in (from packages/debian/control) Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2012-05-24 17:03:44 +0900 (1e11498) +++ .gitignore 2012-05-24 17:13:18 +0900 (0f3bc93) @@ -31,6 +31,7 @@ cmake_install.cmake /stamp-h1 /src/scratch /libmroonga.a +/packages/debian/control /packages/rpm/*/*.spec /packages/yum/fedora/ /packages/yum/centos/ Modified: configure.ac (+4 -1) =================================================================== --- configure.ac 2012-05-24 17:03:44 +0900 (094906e) +++ configure.ac 2012-05-24 17:13:18 +0900 (39fa9f4) @@ -177,8 +177,10 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ ]) m4_define([mrn_required_groonga_version], m4_include(required_groonga_version)) +REQUIRED_GROONGA_VERSION=mrn_required_groonga_version +AC_SUBST(REQUIRED_GROONGA_VERSION) AC_DEFUN([CONFIG_OPTION_GROONGA],[ - PKG_CHECK_MODULES(GROONGA, groonga >= 2.0.3) + PKG_CHECK_MODULES(GROONGA, groonga >= ${REQUIRED_GROONGA_VERSION}) _PKG_CONFIG(GROONGA_VERSION, variable=groonga_version, groonga) GROONGA_VERSION=$pkg_cv_GROONGA_VERSION AC_SUBST(GROONGA_VERSION) @@ -354,6 +356,7 @@ AC_OUTPUT([ mrn_version.h test/sql/suite/mroonga_storage/r/information_schema.result test/sql/suite/mroonga_storage/r/variables.result + packages/debian/control packages/rpm/centos/mysql-mroonga.spec packages/rpm/fedora/mysql-mroonga.spec ]) Renamed: packages/debian/control.in (+2 -2) 93% =================================================================== --- packages/debian/control 2012-05-24 17:03:44 +0900 (7503b6c) +++ packages/debian/control.in 2012-05-24 17:13:18 +0900 (defdb4f) @@ -5,7 +5,7 @@ Maintainer: Kouhei Sutou <kou �� clear-code.com> Build-Depends: debhelper (>= 7.0.50), autotools-dev, - libgroonga-dev (>= 2.0.3), + libgroonga-dev (>= @REQUIRED_GROONGA_VERSION@), libmysqlclient-dev, libssl-dev Standards-Version: 3.9.1 @@ -19,7 +19,7 @@ Breaks: mysql-server-groonga (<< 1.10-1) Depends: ${misc:Depends}, ${shlibs:Depends}, - libgroonga0 (>= 2.0.2), + libgroonga0 (>= @REQUIRED_GROONGA_VERSION@), mysql-server Description: A fast fulltext searchable storage engine for MySQL. Mroonga is a fast fulltext searchable storage engine for MySQL. -------------- next part -------------- HTML����������������������������...Télécharger
