subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1392726 - in /subversion/branches/1.7.x: ./ STATUS build.conf
Date Tue, 02 Oct 2012 04:02:18 GMT
Author: svn-role
Date: Tue Oct  2 04:02:18 2012
New Revision: 1392726

URL: http://svn.apache.org/viewvc?rev=1392726&view=rev
Log:
Merge r1374198 from trunk:

 * r1374198
   Remove mod_dontdothat from install-tools so that configurations
   --without-apxs will not try to build it.
   Justification:
     Fixes regression from 1.7.5.
   Notes:
     Reverts backport of r1307177 because that caused builds to fail
     when Apache headers and libraries were not present. Trunk has a
     followup in r1374357 that reinstates the desired behaviour.
   Votes:
     +1: brane, breser, danielsh (via IRC)

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/build.conf

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1374198

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1392726&r1=1392725&r2=1392726&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Oct  2 04:02:18 2012
@@ -110,18 +110,6 @@ Approved changes:
    Votes:
      +1: stsp, cmpilato, breser
 
- * r1374198
-   Remove mod_dontdothat from install-tools so that configurations
-   --without-apxs will not try to build it.
-   Justification:
-     Fixes regression from 1.7.5.
-   Notes:
-     Reverts backport of r1307177 because that caused builds to fail
-     when Apache headers and libraries were not present. Trunk has a
-     followup in r1374357 that reinstates the desired behaviour.
-   Votes:
-     +1: brane, breser, danielsh (via IRC)
-
  * r1365519, r1383029, r1383483
    Fix assertions in ra_serf triggered when communicating with a
    repository hosted at the server root URL.

Modified: subversion/branches/1.7.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1392726&r1=1392725&r2=1392726&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Tue Oct  2 04:02:18 2012
@@ -367,7 +367,11 @@ type = apache-mod
 path = tools/server-side/mod_dontdothat
 nonlibs = mod_dav_svn apr aprutil
 libs = libsvn_subr xml
-install = tools
+# This will cause mod_dontdothat to be installed with the other apache
+# modules instead of with the tools. While this is not quite right,
+# the build generator currently cannot exclude this module from the
+# build based on its install type
+install = apache-mod
 msvc-libs = libhttpd.lib
 
 # ----------------------------------------------------------------------------



Mime
View raw message