[jbossnative-commits] JBoss Native SVN: r3186 - in trunk/httpd/httpd-2.2/modules: mod_slotmem and 1 other directory.

Author: jfrederic.clere(a)jboss.com Date: 2014-01-25 04:57:50 -0500 (Sat, 25 Jan 2014) New Revision: 3186 Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 Log: Make sure the LoadModule doesn't get commented out. Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-24 22:29:30 UTC (rev 3185) +++ trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-25 09:57:50 UTC (rev 3186) @@ -2,9 +2,17 @@ APACHE_MODPATH_INIT(mod_manager) +if test "$enable_mod_manager" = "shared"; then + mod_manager_mods_enable=shared +elif test "$enable_mod_manager" = "yes"; then + mod_manager_mods_enable=yes +else + mod_manager_mods_enable=no +fi + manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo" -APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , no) +APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , $advertise_mods_enable) if test "$manager_enable" != "no"; then APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/]) Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-24 22:29:30 UTC (rev 3185) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 09:57:50 UTC (rev 3186) @@ -2,8 +2,16 @@ APACHE_MODPATH_INIT(mod_slotmem) +if test "$enable_mod_slotmem" = "shared"; then + mod_slotmem_mods_enable=shared +elif test "$enable_mod_slotmem" = "yes"; then + mod_slotmem_mods_enable=yes +else + mod_slotmem_mods_enable=no +fi + slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" -APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , no) +APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) APACHE_MODPATH_FINISH