You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2005/07/27 21:49:48 UTC
[PATCH] davautocheck.sh: get apxs from Makefile rather than PATH
I don't have apxs in my PATH so I find davautocheck.sh inconvenient.
I think it would be more sensible to use APXS from the Makefile. How
about this?
* subversion/tests/clients/cmdline/davautocheck.sh: Get apxs location
from Makefile rather than PATH.
Index: subversion/tests/clients/cmdline/davautocheck.sh
===================================================================
--- subversion/tests/clients/cmdline/davautocheck.sh (revision 15456)
+++ subversion/tests/clients/cmdline/davautocheck.sh (working copy)
@@ -99,14 +99,10 @@
# dont assume sbin is in the PATH
PATH="/usr/sbin:/usr/local/sbin:$PATH"
-# Pick up value from environment or PATH (also try apxs2 - for Debian)
-[ ${APXS:+set} ] \
- || APXS=$(which apxs) \
- || APXS=$(which apxs2) \
- || fail "neither apxs or apxs2 found - required to run davautocheck"
+# Pick up value from the environment or the Makefile
+[ ${APXS:+set} ] || APXS=$(awk '/^APXS/{print $3}' Makefile)
+[ -n "$APXS" ] && [ -x $APXS ] || fail "Can't execute apxs executable $APXS"
-[ -x $APXS ] || fail "Can't execute apxs executable $APXS"
-
say "Using '$APXS'..."
if [ -x svn-config ]; then
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] davautocheck.sh: get apxs from Makefile rather than
PATH
Posted by Philip Martin <ph...@codematters.co.uk>.
"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> On Wed, 27 Jul 2005, Philip Martin wrote:
>
>> I don't have apxs in my PATH so I find davautocheck.sh inconvenient.
>> I think it would be more sensible to use APXS from the Makefile. How
>> about this?
>>
>> * subversion/tests/clients/cmdline/davautocheck.sh: Get apxs location
>> from Makefile rather than PATH.
>>
> Thanks for the patch. Did you try "make davautocheck". The Makefile tries
> to set APXS from its own variable obtained via autoconf (this is on
> trunk). Does that work for you?
I didn't think of that, I was trying to run the script from the
command line. Yes, it does work.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] davautocheck.sh: get apxs from Makefile rather than PATH
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
On Wed, 27 Jul 2005, Philip Martin wrote:
> I don't have apxs in my PATH so I find davautocheck.sh inconvenient.
> I think it would be more sensible to use APXS from the Makefile. How
> about this?
>
> * subversion/tests/clients/cmdline/davautocheck.sh: Get apxs location
> from Makefile rather than PATH.
>
Thanks for the patch. Did you try "make davautocheck". The Makefile tries
to set APXS from its own variable obtained via autoconf (this is on
trunk). Does that work for you?
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org