Skip to content

Instantly share code, notes, and snippets.

@isabanin
Last active December 15, 2015 08:18
Show Gist options
  • Save isabanin/5229303 to your computer and use it in GitHub Desktop.
Save isabanin/5229303 to your computer and use it in GitHub Desktop.
--- configure.ac (revision 1460229)
+++ configure.ac (working copy)
@@ -1103,18 +1103,18 @@
AC_PATH_PROG(PERL, perl, none)
if test -n "$RUBY"; then
- AC_PATH_PROG(RUBY, "$RUBY", none)
+ AC_PATH_PROG(RUBY, "$RUBY")
else
- AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18, none)
+ AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18)
fi
if test "$RUBY" != "none"; then
AC_MSG_CHECKING([rb_hash_foreach])
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
AC_MSG_RESULT([yes])
if test -n "$RDOC"; then
- AC_PATH_PROG(RDOC, "$RDOC", none)
+ AC_PATH_PROG(RDOC, "$RDOC")
else
- AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
+ AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18)
fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
@@ -1131,13 +1131,10 @@
if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then
# Disallow Ruby 1.9 or later until the binding tests get fixed
# to run with those versions.
- RUBY="none"
AC_MSG_WARN([The detected Ruby is too new for Subversion to use])
AC_MSG_WARN([Only 1.8.x releases are supported at this time])
fi
else
- AC_MSG_RESULT([no])
- RUBY="none"
AC_MSG_WARN([The detected Ruby is too old for Subversion to use])
AC_MSG_WARN([A Ruby which has rb_hash_foreach is required to use the])
AC_MSG_WARN([Subversion Ruby bindings])
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment