svn commit: r1710236 - in /subversion/trunk: build/ac-macros/apache.m4 subversion/tests/cmdline/davautocheck.sh

[ph...@apache.org]

Author: philip
Date: Fri Oct 23 15:24:00 2015
New Revision: 1710236

URL: http://svn.apache.org/viewvc?rev=1710236&view=rev
Log:
* build/ac-macros/apache.m4
  (SVN_FIND_APACHE): Reorder search to prefer local installations
   over system installations.

* subversion/tests/cmdline/davautocheck.sh: Add comment.

Modified:
    subversion/trunk/build/ac-macros/apache.m4
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/trunk/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apache.m4?rev=1710236&r1=1710235&r2=1710236&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Fri Oct 23 15:24:00 2015
@@ -46,7 +46,7 @@ AC_ARG_WITH(apxs,
 ])
 
 if test -z "$APXS"; then
-  for i in /usr/sbin /usr/local/apache/bin /usr/local/apache2/bin /usr/bin ; do
+  for i in /usr/local/apache2/bin /usr/local/apache/bin /usr/bin /usr/sbin ; do
     if test -f "$i/apxs2"; then
       APXS="$i/apxs2"
       break

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1710236&r1=1710235&r2=1710236&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Fri Oct 23 15:24:00 2015
@@ -163,7 +163,8 @@ get_prog_name() {
 }
 
 # Don't assume sbin is in the PATH.
-# ### Presumably this is used to locate /usr/sbin/apxs or /usr/sbin/apache2
+# This is used to locate apxs when the script is invoked manually; when
+# invoked by 'make davautocheck' the APXS environment variable is set.
 PATH="$PATH:/usr/sbin:/usr/local/sbin"
 
 # Find the source and build directories. The build dir can be found if it is