Author: svn-role
Date: Tue Apr 30 04:01:28 2013
New Revision: 1477467
URL: http://svn.apache.org/r1477467
Log:
Merge the r1469862 group from trunk:
* r1469862, r1469866, r1475704
Change configure default to --without-apache-libexecdir.
Justification:
Before this change, by default, Apache modules would very likely be
installed outside of $prefix, while still being linked with shared
libraries in $prefix. This is not expected behaviour.
Votes:
+1: brane, philip, cmpilato
+0: danielsh (refraining from defaulting to ${httpd_libexecdir} is sane:
e.g., allow install >1 svn's against a single httpd install)
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/CHANGES
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/ac-macros/apache.m4
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1469862,1469866,1475704
Modified: subversion/branches/1.8.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/CHANGES?rev=1477467&r1=1477466&r2=1477467&view=diff
==============================================================================
--- subversion/branches/1.8.x/CHANGES (original)
+++ subversion/branches/1.8.x/CHANGES Tue Apr 30 04:01:28 2013
@@ -62,6 +62,7 @@ http://svn.apache.org/repos/asf/subversi
Developer-visible changes:
- General:
* Now require Python 2.5 for tests and dev tools (r1243627)
+ * configure defaults to --without-apache-libexecdir (r1469862)
- API changes:
* fix inconsistent handling of log revs without changed paths (issue #3694)
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1477467&r1=1477466&r2=1477467&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Apr 30 04:01:28 2013
@@ -101,17 +101,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1469862, r1469866, r1475704
- Change configure default to --without-apache-libexecdir.
- Justification:
- Before this change, by default, Apache modules would very likely be
- installed outside of $prefix, while still being linked with shared
- libraries in $prefix. This is not expected behaviour.
- Votes:
- +1: brane, philip, cmpilato
- +0: danielsh (refraining from defaulting to ${httpd_libexecdir} is sane:
- e.g., allow install >1 svn's against a single httpd install)
-
* r1470238, r1471153
Improve labelling of the file diff in interactive conflict resolution 'df'
option. Show labels such as "THEIRS" and "MERGED", not just the paths to
Modified: subversion/branches/1.8.x/build/ac-macros/apache.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/ac-macros/apache.m4?rev=1477467&r1=1477466&r2=1477467&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.8.x/build/ac-macros/apache.m4 Tue Apr 30 04:01:28 2013
@@ -120,23 +120,20 @@ fi
AC_ARG_WITH(apache-libexecdir,
[AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
- [Install Apache modules to PATH instead of Apache's
- configured modules directory; PATH "no"
- or --without-apache-libexecdir means install
- to LIBEXECDIR.])],
-[
- APACHE_LIBEXECDIR="$withval"
-])
+ [Install Apache modules to Apache's configured
+ modules directory instead of LIBEXECDIR;
+ if PATH is given, install to PATH.])],
+[APACHE_LIBEXECDIR="$withval"],[APACHE_LIBEXECDIR='no'])
INSTALL_APACHE_MODS=false
if test -n "$APXS" && test "$APXS" != "no"; then
APXS_CC="`$APXS -q CC`"
APACHE_INCLUDES="$APACHE_INCLUDES -I$APXS_INCLUDE"
- if test -z "$APACHE_LIBEXECDIR"; then
- APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
- elif test "$APACHE_LIBEXECDIR" = 'no'; then
+ if test "$APACHE_LIBEXECDIR" = 'no'; then
APACHE_LIBEXECDIR="$libexecdir"
+ elif test "$APACHE_LIBEXECDIR" = 'yes'; then
+ APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
fi
BUILD_APACHE_RULE=apache-mod
