null+****@clear*****
null+****@clear*****
2012年 3月 5日 (月) 22:30:03 JST
Kouhei Sutou 2012-03-05 22:30:03 +0900 (Mon, 05 Mar 2012)
New Revision: d7617544b69b15e03748612896459f5e39b1d707
Log:
Require --with-ruby19 for testing by Ruby
Modified files:
configure.ac
Modified: configure.ac (+16 -15)
===================================================================
--- configure.ac 2012-03-05 19:05:19 +0900 (6b88165)
+++ configure.ac 2012-03-05 22:30:03 +0900 (5e0fd69)
@@ -671,22 +671,23 @@ AM_CONDITIONAL([WITH_BENCHMARK], [test "$benchmark_available" = "yes"])
# check Ruby for HTTP test
ac_cv_ruby_available="no"
-AC_ARG_WITH([ruby],
- AS_HELP_STRING([--with-ruby=PATH],
- [Ruby interpreter path (default: auto-detect)]),
- [RUBY="$withval"])
-
-if test "$RUBY" = "no"; then
- : # ignore
-elif test "$RUBY" = ""; then
- AC_PATH_PROG(RUBY, ruby, none)
- if test "$RUBY" != "none"; then
- ac_cv_ruby_available="yes"
+AC_ARG_WITH([ruby19],
+ AS_HELP_STRING([--with-ruby19=PATH],
+ [Ruby 1.9 interpreter path (default: no)]),
+ [RUBY="$withval"],
+ [RUBY="no"])
+
+if test "x$RUBY" != "xno"; then
+ if test "x$RUBY" = "xyes"; then
+ AC_PATH_PROGS(RUBY, [ruby1.9 ruby19 ruby1.9.1], none)
+ if test "$RUBY" != "none"; then
+ ac_cv_ruby_available="yes"
+ fi
+ else
+ AC_CHECK_FILE([$RUBY],
+ [ac_cv_ruby_available="yes"],
+ [AC_MSG_WARN([$RUBY is not found. Disable HTTP test.])])
fi
-else
- AC_CHECK_FILE([$RUBY],
- [ac_cv_ruby_available="yes"],
- [AC_MSG_WARN([$RUBY is not found. Disable HTTP test.])])
fi
AC_SUBST(RUBY)
AM_CONDITIONAL([WITH_RUBY], [test "$ac_cv_ruby_available" = "yes"])