You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/04/19 16:54:04 UTC
svn commit: r1469862 - /subversion/trunk/build/ac-macros/apache.m4
Author: brane
Date: Fri Apr 19 14:54:03 2013
New Revision: 1469862
URL: http://svn.apache.org/r1469862
Log:
Change the default install location for Apache modules to $prefix/libexec
instead of the installed Apache's modules directory, which can easily be
outside $prefix. This also changes the default of the configure option
--with-apache-libexecdir from "yes" to "no".
* build/ac-macros/apache.m4: Set default value of APACHE_LIBEXECDIR to "no",
update option value processing and update the docstring of the
--with-apache-libexecdir configure option.
Modified:
subversion/trunk/build/ac-macros/apache.m4
Modified: subversion/trunk/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apache.m4?rev=1469862&r1=1469861&r2=1469862&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Fri Apr 19 14:54:03 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 LIBEXECDIIR;
+ 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