Attachment #85457 for bug #131221




      NEON_VERSION=`cat $abs_srcdir/neon/.version`
      AC_MSG_RESULT([$NEON_VERSION])

      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
        AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
      fi

      for svn_allowed_neon in $NEON_ALLOWED_LIST; do

      NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
      AC_MSG_RESULT([$NEON_VERSION])

      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
        AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
      fi

      for svn_allowed_neon in $NEON_ALLOWED_LIST; do

Lines 226-232 Link Here

(-)subversion-1.3.1/configure.in (-1 / +1 lines)
226		226
227	# Either a space-separated list of allowable Neon versions, or "any" to	227	# Either a space-separated list of allowable Neon versions, or "any" to
228	# mean allow anything.	228	# mean allow anything.
229	NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"	229	NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0"
230	NEON_LATEST_WORKING_VER=0.25.5	230	NEON_LATEST_WORKING_VER=0.25.5
231	NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"	231	NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
232	dnl You can skip the neon version check only if you know what you are doing	232	dnl You can skip the neon version check only if you know what you are doing

Return to bug 131221

Lines 50-58 Link Here

(-)subversion-1.3.1/build/ac-macros/neon.m4 (-4 / +6 lines)
50	NEON_VERSION=`cat $abs_srcdir/neon/.version`	50	NEON_VERSION=`cat $abs_srcdir/neon/.version`
51	AC_MSG_RESULT([$NEON_VERSION])	51	AC_MSG_RESULT([$NEON_VERSION])
52		52
53	if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.25\.'`" ; then	53	if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.25\.'`" \|\| \
		54	test -n "`echo \"$NEON_VERSION\" \| grep '^0\.26\.'`" ; then
54	AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],	55	AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
55	[Defined if have Neon 0.25.x instead of 0.24.7.])	56	[Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
56	fi	57	fi
57		58
58	for svn_allowed_neon in $NEON_ALLOWED_LIST; do	59	for svn_allowed_neon in $NEON_ALLOWED_LIST; do
Lines 123-131 Link Here
123	NEON_VERSION=`$neon_config --version \| sed -e 's/^neon //'`	123	NEON_VERSION=`$neon_config --version \| sed -e 's/^neon //'`
124	AC_MSG_RESULT([$NEON_VERSION])	124	AC_MSG_RESULT([$NEON_VERSION])
125		125
126	if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.25\.'`" ; then	126	if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.25\.'`" \|\| \
		127	test -n "`echo \"$NEON_VERSION\" \| grep '^0\.26\.'`" ; then
127	AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],	128	AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
128	[Defined if have Neon 0.25.x instead of 0.24.7.])	129	[Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
129	fi	130	fi
130		131
131	for svn_allowed_neon in $NEON_ALLOWED_LIST; do	132	for svn_allowed_neon in $NEON_ALLOWED_LIST; do