svn commit: r1516019 - in /subversion/branches/1.8.x: ./ Makefile.in STATUS subversion/tests/cmdline/davautocheck.sh

[br...@apache.org]

Author: breser
Date: Tue Aug 20 23:03:21 2013
New Revision: 1516019

URL: http://svn.apache.org/r1516019
Log:
Merge the r1507889 group from trunk:

 * r1507889, r1507891
   davautocheck: use the correct apxs binary by default.
   Justification:
     Convenience aside, without this patch, davautocheck would use the wrong
     apxs binary when invoked "by hand" (not via make).
   Votes:
     +1: danielsh, breser, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/Makefile.in
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/tests/cmdline/davautocheck.sh

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1507889,1507891

Modified: subversion/branches/1.8.x/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/Makefile.in?rev=1516019&r1=1516018&r2=1516019&view=diff
==============================================================================
--- subversion/branches/1.8.x/Makefile.in (original)
+++ subversion/branches/1.8.x/Makefile.in Tue Aug 20 23:03:21 2013
@@ -340,8 +340,8 @@ TEST_SHLIB_VAR_SWIG_RB=\
     done; \
     export @SVN_APR_SHLIB_PATH_VAR@; \
   fi;
- 
-APXS = @APXS@ 
+
+APXS = @APXS@
 
 PYTHON = @PYTHON@
 PERL = @PERL@

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1516019&r1=1516018&r2=1516019&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Aug 20 23:03:21 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1507889, r1507891
-   davautocheck: use the correct apxs binary by default.
-   Justification:
-     Convenience aside, without this patch, davautocheck would use the wrong
-     apxs binary when invoked "by hand" (not via make).
-   Votes:
-     +1: danielsh, breser, stefan2
-
  * r1506047
    Add swig_diff target to the __SWIG_PERL__ and __SWIG_RUBY__ targets in
    build.conf

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/davautocheck.sh?rev=1516019&r1=1516018&r2=1516019&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/davautocheck.sh Tue Aug 20 23:03:21 2013
@@ -27,7 +27,7 @@
 # testing are:
 #   - Subversion built using --enable-shared --enable-dso --with-apxs options,
 #   - Working Apache 2 HTTPD Server with the apxs program reachable through
-#     PATH or specified via the APXS environment variable,
+#     PATH or specified via the APXS Makefile variable or environment variable,
 #   - Modules dav_module and log_config_module compiled as DSO or built into
 #     Apache HTTPD Server executable.
 # The basic intension of this script is to be able to perform "make check"
@@ -159,6 +159,17 @@ get_prog_name() {
 # Don't assume sbin is in the PATH.
 PATH="$PATH:/usr/sbin:/usr/local/sbin"
 
+# Find the source and build directories. The build dir can be found if it is
+# the current working dir or the source dir.
+ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
+if [ -x subversion/svn/svn ]; then
+  ABS_BUILDDIR=$(pwd)
+elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
+  ABS_BUILDDIR=$ABS_SRCDIR
+else
+  fail "Run this script from the root of Subversion's build tree!"
+fi
+
 # Remove any proxy environmental variables that affect wget or curl.
 # We don't need a proxy to connect to localhost and having the proxy
 # environmental variables set breaks the Apache configuration file
@@ -169,10 +180,18 @@ unset http_proxy
 unset HTTPS_PROXY
 
 # 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"
+if [ ${APXS:+set} ]; then
+  :
+elif APXS=$(grep '^APXS' $ABS_BUILDDIR/Makefile | sed 's/^APXS *= *//') && \
+     [ -n "$APXS" ]; then
+  :
+elif APXS=$(which apxs); then
+  :
+elif APXS=$(which apxs2); then
+  :
+else
+  fail "neither apxs or apxs2 found - required to run davautocheck"
+fi
 
 [ -x $APXS ] || fail "Can't execute apxs executable $APXS"
 
@@ -195,17 +214,6 @@ if [ ${CACHE_REVPROPS:+set} ]; then
   CACHE_REVPROPS_SETTING=on
 fi
 
-# Find the source and build directories. The build dir can be found if it is
-# the current working dir or the source dir.
-ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
-if [ -x subversion/svn/svn ]; then
-  ABS_BUILDDIR=$(pwd)
-elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
-  ABS_BUILDDIR=$ABS_SRCDIR
-else
-  fail "Run this script from the root of Subversion's build tree!"
-fi
-
 if [ ${MODULE_PATH:+set} ]; then
     MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so"
     MOD_AUTHZ_SVN="$MODULE_PATH/mod_authz_svn.so"