[csw-devel] SF.net SVN: gar:[11001] csw/mgar/pkg/apache2/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 11001
          http://gar.svn.sourceforge.net/gar/?rev=11001&view=rev
Author:   bdwalton
Date:     2010-09-18 14:52:55 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
apache2: correct merge scripts; only build modules for prefork mpm

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 02:33:17 UTC (rev 11000)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-18 14:52:55 UTC (rev 11001)
@@ -18,7 +18,7 @@
 MODULATIONS_MPM = prefork worker
 
 MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
-MERGE_SCRIPTS_isa-default-mpm-worker = copy-only
+MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
 
 include files/config.mk
 
@@ -87,6 +87,9 @@
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
 CONFIGURE_ARGS += --with-mpm=$(MPM)
 CONFIGURE_ARGS += --disable-static
+ifneq ($(MPM),prefork)
+CONFIGURE_ARGS += --enable-modules=none
+endif
 
 # Fixup target variables
 APACHE_ROOT   = $(DESTDIR)$(prefix)/apache2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.