Hi,
The included patch makes subversion's neon configuration behave in a
more obvious way. The current behavior is odd given that subversion
release tarballs include a neon/ subdir. At present if one wants to
use the system's neon then the neon/ subdir must be deleted from the
source tree. As the Debian package maintainer I would rather make
fewer changes to the pristine upstream source. This patch allows the
user to ignore the neon/ subdir by passing the --with-neon switch to
configure.
Thanks,
David
* ac-helpers/neon.m4 (SVN_LIB_NEON): During configure if
--with-neon option is passed ignore any neon/ subdir in
the source tree.
Index: ./neon.m4
===================================================================
--- ./neon.m4
+++ ./neon.m4 Mon Apr 15 07:09:46 2002
@@ -5,15 +5,16 @@
dnl to match versions of Neon that can be used. latest_working_ver
dnl is the latest version of neon that can be used, which is not
dnl necessarily the latest released version of neon that exists.
-dnl can be used. url is the URL of the latest version of Neon.
+dnl url is the URL of the latest version of Neon.
dnl
-dnl If there is a neon/ subdir we assume we want to use it.
-dnl If the subdir is the wrong version we exit with a failure
-dnl regardless if neon is installed somewhere else on the system.
+dnl If a --with-neon[=ARG] option is passed search for a suitable
+dnl neon installed on the system [as indicated by ARG]. In this case
+dnl ignore any neon/ subdir within the source tree.
dnl
-dnl If there isn't a neon/ subdir then we look for 'neon-config'
-dnl in PATH (or the location specified by a --with-neon=PATH
-dnl switch).
+dnl If no --with-neon option is passed look first for a neon/ subdir.
+dnl If a neon/ subdir exists and is the wrong version exit with a
+dnl failure. If no neon/ subdir is present search for a neon installed
+dnl on the system.
AC_DEFUN(SVN_LIB_NEON,
[
@@ -30,18 +31,13 @@
in a subdirectory of the top source directory and then to
look for neon-config in $PATH.])],
[
- if test -d $abs_srcdir/neon ; then
- AC_MSG_ERROR([--with-neon option but neon/ subdir exists.
-Please either remove that subdir or don't use the --with-neon option.])
+ if test "$withval" = "yes" ; then
+ AC_PATH_PROG(neon_config,neon-config)
else
- if test "$withval" = "yes" ; then
- AC_PATH_PROG(neon_config,neon-config)
- else
- neon_config="$withval/bin/neon-config"
- fi
-
- SVN_NEON_CONFIG()
+ neon_config="$withval/bin/neon-config"
fi
+
+ SVN_NEON_CONFIG()
],
[
if test -d $abs_srcdir/neon ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 15 17:03:24 2002