Re: [PATCH] Include log_config module in apache.conf

[Junio C Hamano <gitster@pobox.com>]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Sorry, no:
>
> -- snip --
> apache2: Syntax error on line 7 of 
> /home/schindelin/git/t/lib-httpd/apache.conf: module log_config_module is 
> built-in and can't be loaded
> -- snap --

Sorry and thanks---I'll apply an interdiff and credit it to you.

-- >8 --
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 11 Mar 2009 12:47:06 +0100 (CET)
Subject: [PATCH] test: do not LoadModule log_config_module unconditionally

LoadModule directive for log_config_module will not work if the module is
built-in.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/lib-httpd/apache.conf |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a0d4077..f460e40 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -4,7 +4,9 @@ DocumentRoot www
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 CustomLog access.log common
 ErrorLog error.log
-LoadModule log_config_module modules/mod_log_config.so
+<IfModule !mod_log_config.c>
+	LoadModule log_config_module modules/mod_log_config.so
+</IfModule>
 
 <IfDefine Darwin>
 	LoadModule log_config_module modules/mod_log_config.so
--