diff options
| author | peter <peter@FreeBSD.org> | 2015-10-12 04:57:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2015-10-12 04:57:36 +0000 |
| commit | 6a8fa4cab570f77af8326e0339fdf0b4c09756c6 (patch) | |
| tree | 64caa5ea4f1fe4b74e7d1dcbc5bdc3c674998b26 /contrib/subversion/configure.ac | |
| parent | 5ee4ad2f183130d523ba9911b00fe7b158897de8 (diff) | |
| download | FreeBSD-src-6a8fa4cab570f77af8326e0339fdf0b4c09756c6.zip FreeBSD-src-6a8fa4cab570f77af8326e0339fdf0b4c09756c6.tar.gz | |
MFC: r269851,r272076,r274884,r282328,r285644,r286503,r286504,r286505,
r286506,r286510,r286561,r286562,r287034
Update svnlite from 1.8.10 to 1.8.14, and the support components:
serf->1.3.8, apr->1.5.2, apr-util->1.5.4, sqlite3->3.8.11.1
This includes syncing the developer templates with head.
Diffstat (limited to 'contrib/subversion/configure.ac')
| -rw-r--r-- | contrib/subversion/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/subversion/configure.ac b/contrib/subversion/configure.ac index 955ba25..b198c04 100644 --- a/contrib/subversion/configure.ac +++ b/contrib/subversion/configure.ac @@ -1246,7 +1246,7 @@ AC_PATH_PROG(PERL, perl, none) if test -n "$RUBY"; then AC_PATH_PROG(RUBY, "$RUBY", none) else - AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, none) + AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193 ruby2.0 ruby2.1, none) fi if test "$RUBY" != "none"; then AC_MSG_CHECKING([rb_hash_foreach]) @@ -1255,7 +1255,7 @@ if test "$RUBY" != "none"; then if test -n "$RDOC"; then AC_PATH_PROG(RDOC, "$RDOC", none) else - AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, none) + AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193 rdoc2.0 rdoc2.1, none) fi AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`" |
