Jon Middleton wrote:
>* Makefile.in
> Change the -a option of INSTALL_MOD_SHARED to @MOD_ACTIVATION@
> substation variable which is defined by configure.
>
>* configure.in
> Add a AC_ARG_ENABLE function that defines a mod-activation feature
> which sub-statues @MOD_ACTIVATION@ in Makefile.in, this feature
> defaults to on.
>
>-
>Patch description
>
>This patch adds a configure option can unset the -a option to apxs
>when installing the module. It keeps the current behavior by
>defaulting to on if the option is leave of the command line or
>--enable-mod-activation is passed to configure.
>
>Jon.
>
>Index: ./Makefile.in
>===================================================================
>--- ./Makefile.in
>+++ ./Makefile.in 2002-07-30 21:30:34.000000000 +0100
>@@ -80,7 +80,7 @@
> INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
> INSTALL_FS_BIN = $(INSTALL_BIN)
> INSTALL_INCLUDE = $(INSTALL) -m 644
>-INSTALL_MOD_SHARED = @APXS@ -i -a
>+INSTALL_MOD_SHARED = @APXS@ -i @MOD_ACTIVATION@
> INSTALL_MOD_STATIC = $(INSTALL) -m 644
> INSTALL_DATA = $(INSTALL) -m 644
>
>Index: ./configure.in
>===================================================================
>--- ./configure.in
>+++ ./configure.in 2002-07-31 00:12:41.000000000 +0100
>@@ -198,6 +198,21 @@
> fi
> ])
>
>+MOD_ACTIVATION="-a"
>+AC_ARG_ENABLE(mod-activation,
>+[ --enable-mod-activation Do turn on the mod_svn module in httpd.conf],
>
The help message should describe the expected usage, not the default
value. You'll almost never pass --enable-mod-activation, because that's
the default. You will use --disable-mod-activation, though. So this
should be:
--disable-mod-activation Do not enable mod_dav_svn in httpd.conf
>+[
>+ if test "$enableval" = "no" ; then
>+ MOD_ACTIVATION=""
>+ AC_MSG_NOTICE([Disabling apache module activation])
>+ mod_activation=no
>
What's this for? Is mod_activation (lowercase name) used anywhere?
>+ else
>+ AC_MSG_NOTICE([Enabling apache module activation])
>+ fi
>+])
>+AC_SUBST(MOD_ACTIVATION)
>+
>+
> AC_ARG_ENABLE(maintainer-mode,
> [ --enable-maintainer-mode Turn on debugging and very strict compile-time
> warnings],
>
>
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 1 10:10:31 2002