null+****@clear*****
null+****@clear*****
2012年 6月 9日 (土) 19:27:28 JST
Kouhei Sutou 2012-06-09 19:27:28 +0900 (Sat, 09 Jun 2012)
New Revision: 4862a3d8eb56e684695caead6520683be84a4ff2
Log:
Detect Ruby 1.9 that is installed as "ruby" command
Modified files:
configure.ac
Modified: configure.ac (+7 -2)
===================================================================
--- configure.ac 2012-06-09 19:26:45 +0900 (5d48a8b)
+++ configure.ac 2012-06-09 19:27:28 +0900 (6cea064)
@@ -682,9 +682,14 @@ if test "x$RUBY" = "xno"; then
RUBY=
else
if test "x$RUBY" = "xyes"; then
- AC_PATH_PROGS(RUBY, [ruby1.9 ruby19 ruby1.9.1], ruby19-not-found)
+ AC_PATH_PROGS(RUBY, [ruby1.9 ruby19 ruby1.9.1 ruby], ruby19-not-found)
if test "$RUBY" != "ruby19-not-found"; then
- ac_cv_ruby_available="yes"
+ ruby_version="`$RUBY --version`"
+ if echo "$ruby_version" | grep -q -- 'ruby 1\.9'; then
+ ac_cv_ruby_available="yes"
+ else
+ AC_MSG_WARN([$RUBY isn't Ruby 1.9 ($ruby_version)])
+ fi
fi
else
ruby_not_found_warning_message="$RUBY is not found. Disable HTTP test."