diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 04:59:53 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 04:59:53 +0000 |
| commit | 1d99647092497faced8360b3a90764af0a729b14 (patch) | |
| tree | 4801e20feb28d7328792bea16d2aa17e50adc630 /contrib/subversion/configure.ac | |
| parent | 20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb (diff) | |
| download | FreeBSD-src-1d99647092497faced8360b3a90764af0a729b14.zip FreeBSD-src-1d99647092497faced8360b3a90764af0a729b14.tar.gz | |
Merge svn-1.8.8 -> 1.8.9
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 e93d7a3..f7d2264 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" ]) |
