subversion/subversion.allowed-neon.patch

43 lines
1.9 KiB
Diff
Raw Normal View History

---
build/ac-macros/neon.m4 | 4 ++--
configure.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: subversion-1.3.x/configure.in
===================================================================
--- subversion-1.3.x.orig/configure.in
+++ subversion-1.3.x/configure.in
@@ -226,8 +226,8 @@ AC_SUBST(LT_NO_UNDEFINED)
# Either a space-separated list of allowable Neon versions, or "any" to
# mean allow anything.
-NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
-NEON_LATEST_WORKING_VER=0.25.5
+NEON_ALLOWED_LIST="0.24.4 0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3"
+NEON_LATEST_WORKING_VER=0.26.3
NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
dnl You can skip the neon version check only if you know what you are doing
AC_ARG_ENABLE(neon-version-check,
Index: subversion-1.3.x/build/ac-macros/neon.m4
===================================================================
--- subversion-1.3.x.orig/build/ac-macros/neon.m4
+++ subversion-1.3.x/build/ac-macros/neon.m4
@@ -50,7 +50,7 @@ AC_DEFUN(SVN_LIB_NEON,
NEON_VERSION=`cat $abs_srcdir/neon/.version`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
+ if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.2(5|6)\.'`" ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Defined if have Neon 0.25.x instead of 0.24.7.])
fi
@@ -123,7 +123,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
+ if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.2(5|6)\.'`" ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Defined if have Neon 0.25.x instead of 0.24.7.])
fi