Kouhei Sutou
null+****@clear*****
Mon Oct 27 10:12:43 JST 2014
Kouhei Sutou 2014-10-27 10:12:43 +0900 (Mon, 27 Oct 2014) New Revision: 3a1a50112bd6fff168e88994e9dd341b62eb1cf6 https://github.com/groonga/groonga-normalizer-mysql/commit/3a1a50112bd6fff168e88994e9dd341b62eb1cf6 Message: Accept Ruby 1.9 or later Modified files: configure.ac Modified: configure.ac (+9 -7) =================================================================== --- configure.ac 2014-10-27 10:12:32 +0900 (9c3d20b) +++ configure.ac 2014-10-27 10:12:43 +0900 (6a1019c) @@ -51,9 +51,9 @@ AC_SUBST(normalizers_pluginsdir) # check Ruby for test ac_cv_ruby_available="no" -AC_ARG_WITH([ruby19], - AS_HELP_STRING([--with-ruby19=PATH], - [Ruby 1.9 interpreter path (default: auto)]), +AC_ARG_WITH([ruby], + AS_HELP_STRING([--with-ruby=PATH], + [Ruby interpreter path (default: auto)]), [RUBY="$withval"], [RUBY="auto"]) @@ -61,13 +61,15 @@ if test "x$RUBY" = "xno"; then RUBY= else if test "x$RUBY" = "xauto"; then - AC_PATH_PROGS(RUBY, [ruby1.9 ruby19 ruby1.9.1 ruby], ruby19-not-found) - if test "$RUBY" != "ruby19-not-found"; then + AC_PATH_PROGS(RUBY, + [ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9 ruby19 ruby1.9.1 ruby], + ruby-not-found) + if test "$RUBY" != "ruby-not-found"; then ruby_version="`$RUBY --version`" - if echo "$ruby_version" | grep -q -- 'ruby 1\.9'; then + if echo "$ruby_version" | grep -q -- 'ruby \(1\.9\|2\.\)'; then ac_cv_ruby_available="yes" else - AC_MSG_WARN([$RUBY isn't Ruby 1.9 ($ruby_version)]) + AC_MSG_WARN([$RUBY isn't Ruby 1.9 or later ($ruby_version)]) fi fi else -------------- next part -------------- HTML����������������������������...Download