svn commit: r956857 - in /httpd/httpd/trunk/modules: cache/config.m4 cluster/config5.m4 session/config.m4

[bj...@apache.org]

Author: bjh
Date: Tue Jun 22 11:57:51 2010
New Revision: 956857

URL: http://svn.apache.org/viewvc?rev=956857&view=rev
Log:
OS/2: Fix building of more modules that depend on symbols from other modules.
Affected modules are: mod_heartbeat, mod_session_cookie, mod_session_crypto,
mod_session_dbd and mod_disk_cache.

Modified:
    httpd/httpd/trunk/modules/cache/config.m4
    httpd/httpd/trunk/modules/cluster/config5.m4
    httpd/httpd/trunk/modules/session/config.m4

Modified: httpd/httpd/trunk/modules/cache/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/config.m4?rev=956857&r1=956856&r2=956857&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/config.m4 (original)
+++ httpd/httpd/trunk/modules/cache/config.m4 Tue Jun 22 11:57:51 2010
@@ -12,8 +12,18 @@ mod_cache.lo dnl
 cache_storage.lo dnl
 cache_util.lo dnl
 "
+disk_cache_objs="mod_disk_cache.lo"
+
+case "$host" in
+  *os2*)
+    # OS/2 DLLs must resolve all symbols at build time
+    # and we need some from main cache module
+    disk_cache_objs="$disk_cache_objs mod_cache.la"
+    ;;
+esac
+
 APACHE_MODULE(cache, dynamic file caching, $cache_objs, , most)
-APACHE_MODULE(disk_cache, disk caching module, , , most)
+APACHE_MODULE(disk_cache, disk caching module, $disk_cache_objs, , most)
 
 AC_DEFUN([CHECK_DISTCACHE], [
   AC_CHECK_HEADER(

Modified: httpd/httpd/trunk/modules/cluster/config5.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/config5.m4?rev=956857&r1=956856&r2=956857&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/config5.m4 (original)
+++ httpd/httpd/trunk/modules/cluster/config5.m4 Tue Jun 22 11:57:51 2010
@@ -1,7 +1,17 @@
 
 APACHE_MODPATH_INIT(cluster)
 
-APACHE_MODULE(heartbeat, Generates Heartbeats, , , most)
+heartbeat_objects='mod_heartbeat.lo'
+
+case "$host" in
+  *os2*)
+    # OS/2 DLLs must resolve all symbols at build time
+    # and we need some from the watchdog module
+    heartbeat_objects="$heartbeat_objects ../core/mod_watchdog.la"
+    ;;
+esac
+
+APACHE_MODULE(heartbeat, Generates Heartbeats, $heartbeat_objects, , most)
 APACHE_MODULE(heartmonitor, Collects Heartbeats, , , most)
 
 APACHE_MODPATH_FINISH

Modified: httpd/httpd/trunk/modules/session/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/config.m4?rev=956857&r1=956856&r2=956857&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/config.m4 (original)
+++ httpd/httpd/trunk/modules/session/config.m4 Tue Jun 22 11:57:51 2010
@@ -15,9 +15,23 @@ APACHE_MODPATH_INIT(session)
 dnl Session modules; modules that are capable of storing key value pairs in
 dnl various places, such as databases, LDAP, or cookies.
 dnl
+session_cookie_objects='mod_session_cookie.lo'
+session_crypto_objects='mod_session_crypto.lo'
+session_dbd_objects='mod_session_dbd.lo'
+
+case "$host" in
+  *os2*)
+    # OS/2 DLLs must resolve all symbols at build time
+    # and we need some from main session module
+    session_cookie_objects="$session_cookie_objects mod_session.la"
+    session_crypto_objects="$session_crypto_objects mod_session.la"
+    session_dbd_objects="$session_dbd_objects mod_session.la"
+    ;;
+esac
+
 APACHE_MODULE(session, session module, , , most)
-APACHE_MODULE(session_cookie, session cookie module, , , $session_mods_enable)
-APACHE_MODULE(session_crypto, session crypto module, , , no, [
+APACHE_MODULE(session_cookie, session cookie module, $session_cookie_objects, , $session_mods_enable)
+APACHE_MODULE(session_crypto, session crypto module, $session_crypto_objects, , no, [
   saved_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES"
   AC_CHECK_HEADERS(apr_crypto.h, [ap_HAVE_APR_CRYPTO="yes"], [ap_HAVE_APR_CRYPTO="no"])
@@ -27,7 +41,7 @@ APACHE_MODULE(session_crypto, session cr
     enable_session_crypto="no"
   fi
 ])
-APACHE_MODULE(session_dbd, session dbd module, , , $session_mods_enable)
+APACHE_MODULE(session_dbd, session dbd module, $session_dbd_objects, , $session_mods_enable)
 dnl APACHE_MODULE(session_ldap, session ldap module, , , $session_mods_enable)
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])