Re: [PATCH]: --with-neon switch should ignore neon/ subdir.

[David Kimdon <dw...@debian.org>]

Hi,

This patch hasn't made it in yet, I wonder if there is anything I can do to
help it along.  The thread started here:

http://subversion.tigris.org/servlets/ReadMsg?msgId=68430&listName=dev

I believe this patch addresses Karl's concern (now if --with-neon has no
argument 'configure' exits with an error).  This is the same (updated) patch I
sent on April 15.

-David

        * ac-helpers/neon.m4 (SVN_LIB_NEON): During configure if
          --with-neon=PREFIX option is passed ignore any neon/ subdir
          in the source tree. Instead, use the the neon installed in
          PREFIX if possible.

Index: ac-helpers/neon.m4
===================================================================
--- ac-helpers/neon.m4
+++ ac-helpers/neon.m4	Mon Apr 15 21:03:33 2002
@@ -5,15 +5,17 @@
 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=PREFIX option is passed search for a suitable
+dnl   neon installed on the system whose configuration can be found in
+dnl   PREFIX/bin/neon-config.  In this case ignore any neon/ subdir 
+dnl   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 +32,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_MSG_ERROR([--with-neon requires an argument.])
     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

Re: [PATCH]: --with-neon switch should ignore neon/ subdir.

[Karl Fogel <kf...@newton.ch.collab.net>]

David Kimdon <dw...@debian.org> writes:
> This patch hasn't made it in yet, I wonder if there is anything I can do to
> help it along.  The thread started here:
> 
> http://subversion.tigris.org/servlets/ReadMsg?msgId=68430&listName=dev
> 
> I believe this patch addresses Karl's concern (now if --with-neon has no
> argument 'configure' exits with an error).  This is the same
> (updated) patch I sent on April 15.

Yup, sorry for the delay in applying this.  It's in revision 1839 now.

-K


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org