diff options
| author | peter <peter@FreeBSD.org> | 2014-08-12 01:40:11 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-08-12 01:40:11 +0000 |
| commit | 72d63a715ab3bb85109696154deb9b90d0495852 (patch) | |
| tree | ce225c894795f3e26aadf9170baf8fd0556c18d2 /contrib/subversion/configure.ac | |
| parent | d307c6d3b7fc94a241aab28f56b9e92a10d98bee (diff) | |
| download | FreeBSD-src-72d63a715ab3bb85109696154deb9b90d0495852.zip FreeBSD-src-72d63a715ab3bb85109696154deb9b90d0495852.tar.gz | |
MFC r266728,266731,266735,266736,268135,268960,269833
Update apr 1.4.8 -> 1.5.1
Update apr-util 1.5.2 -> 1.5.3
Update serf 1.3.4 -> 1.3.7
Update svnlite 1.8.8 -> 1.8.10
Deal with svnlite.1 manpage.
Diffstat (limited to 'contrib/subversion/configure.ac')
| -rw-r--r-- | contrib/subversion/configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/subversion/configure.ac b/contrib/subversion/configure.ac index e93d7a3..955ba25 100644 --- a/contrib/subversion/configure.ac +++ b/contrib/subversion/configure.ac @@ -98,7 +98,7 @@ dnl now generating errors instead of silently ignoring dnl them. Only .7 and later can guarantee repository dnl integrity with FSFS. -APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."] +APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."] SVN_LIB_APR($APR_VER_REGEXES) @@ -755,7 +755,7 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--with-libmagic=PREFIX], CPPFLAGS="$CPPFLAGS -I$libmagic_prefix/include" AC_CHECK_HEADERS(magic.h,[ save_ldflags="$LDFLAGS" - LDFLAGS="-L$libmagic_prefix/lib" + LDFLAGS="-L$libmagic_prefix/lib $LDFLAGS" AC_CHECK_LIB(magic, magic_open, [libmagic_found="yes"]) LDFLAGS="$save_ldflags" ]) @@ -1280,10 +1280,6 @@ if test "$RUBY" != "none"; then RUBY="none" AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3]) AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time]) - elif test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then - #Warn about 1.9.3 support - AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3]) - AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new]) fi else AC_MSG_RESULT([no]) |
