Index: openacs-4/etc/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/config.tcl,v
diff -u -r1.12.2.2 -r1.12.2.3
--- openacs-4/etc/config.tcl	3 Dec 2003 20:59:24 -0000	1.12.2.2
+++ openacs-4/etc/config.tcl	10 Dec 2003 12:07:34 -0000	1.12.2.3
@@ -53,7 +53,6 @@
 ns_param   nssha1             ${bindir}/nssha1.so 
 ns_param   nscache            ${bindir}/nscache.so 
 ns_param   nsrewrite          ${bindir}/nsrewrite.so 
-ns_param   libtdom            ${bindir}/libtdom.so
 
 #---------------------------------------------------------------------
 # nsopenssl will fail unless the cert files are present as specified
@@ -74,10 +73,14 @@
 #ns_param   nscgi              ${bindir}/nscgi.so 
 #ns_param   nsjava             ${bindir}/libnsjava.so
 
-# Required for AOLserver 4
-#ns_param   nsdb               ${bindir}/nsdb.so
+if { [ns_info version] >= 4 } {
+    # Required for AOLserver 4.x
+    ns_param   nsdb               ${bindir}/nsdb.so
+} else {
+    # Required for AOLserver 3.x
+    ns_param   libtdom            ${bindir}/libtdom.so
+}
 
-
 #---------------------------------------------------------------------
 #
 # Rollout email support
@@ -143,7 +146,8 @@
 
 ns_section ns/threads 
 ns_param   mutexmeter         true      ;# measure lock contention 
-ns_param   stacksize          500000
+# The per-thread stack size must be a multiple of 8k for AOLServer to run under MacOS X
+ns_param   stacksize          [expr 128 * 8192]
 
 # 
 # MIME types. 
Index: openacs-4/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/tcl/0-acs-init.tcl,v
diff -u -r1.4 -r1.4.10.1
--- openacs-4/tcl/0-acs-init.tcl	29 Aug 2001 21:22:49 -0000	1.4
+++ openacs-4/tcl/0-acs-init.tcl	10 Dec 2003 12:07:34 -0000	1.4.10.1
@@ -17,8 +17,26 @@
 ns_log "Notice" "Sourcing $bootstrap_file"
 
 if { [file isfile $bootstrap_file] } {
+
+    # Check that the appropriate version of tDom (http://www.tdom.org) is installed
+    # and spit out a comment or try to install it if not.
+    if {[string equal {} [info commands domNode]]} { 
+	if {[ns_info version] < 4} {
+	    ns_log Error "0-acs-init.tcl: domNode command not found -- libtdom.so not loaded?"
+	} elseif {[ns_info version] >= 4} {
+	    if {[catch {set version [package require tdom]} errmsg]} { 
+		ns_log Error "0-acs-init.tcl: error loading tdom: $errmsg" 
+	    } else {
+		foreach {major minor point} [split $version .] { break }
+		if {$major == 0 
+		    && ( $minor < 7 || ($minor == 7 && $point < 8))} { 
+		    ns_log Error "0-acs-init.tcl: please use tdom version 0.7.8 or greater (you have version $version)"
+		}
+	    }
+	}
+    }
+        
     source $bootstrap_file
 } else {
     ns_log "Error" "$bootstrap_file does not exist. Aborting the OpenACS load process."
 }
-