Skip to content

Commit

Permalink
allow ruby versions over 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mrbrdo committed Oct 3, 2014
1 parent d54eab9 commit 3b7a7e7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 5 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2808,11 +2808,13 @@ test "$ruby_major_version" -lt 1 && { { $as_echo "$as_me:${as_lineno-$LINENO}: e
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "ruby version in \$PATH is $ruby_version; must be at least 1.9
See \`config.log' for more details" "$LINENO" 5; }
test "$ruby_minor_version" -lt 9 && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
if test "$ruby_major_version" -eq 1 ; then
test "$ruby_minor_version" -lt 9 && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "ruby version in \$PATH is $ruby_version; must be at least 1.9
as_fn_error $? "ruby version in \$PATH is
$ruby_version; must be at least 1.9
See \`config.log' for more details" "$LINENO" 5; }

fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby gem activesupport" >&5
$as_echo_n "checking for ruby gem activesupport... " >&6; }
echo 'gem = Gem::Specification.find_by_name("activesupport")' | $RUBY 2>/dev/null ; gem_activesupport=$?
Expand Down
6 changes: 4 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ changequote([,])
test -z "$ruby_major_version" && AC_MSG_FAILURE([ruby in \$PATH does not work])
test -z "$ruby_minor_version" && AC_MSG_FAILURE([ruby in \$PATH does not work])
test "$ruby_major_version" -lt 1 && AC_MSG_FAILURE([ruby version in \$PATH is $ruby_version; must be at least 1.9])
test "$ruby_minor_version" -lt 9 && AC_MSG_FAILURE([ruby version in \$PATH is $ruby_version; must be at least 1.9])

if test "$ruby_major_version" -eq 1 ; then
test "$ruby_minor_version" -lt 9 && AC_MSG_FAILURE([ruby version in \$PATH is
$ruby_version; must be at least 1.9])
fi
dnl Ensure ruby gems: activesupport i18n.
AC_MSG_CHECKING([for ruby gem activesupport])
echo 'gem = Gem::Specification.find_by_name("activesupport")' | $RUBY 2>/dev/null ; gem_activesupport=$?
Expand Down

0 comments on commit 3b7a7e7

Please sign in to comment.