JSVC patch to support Tru64/Alpha systems

[Max Zinal]

This is a patch over JSVC source distribution which was inside Tomcat 
5.0.24.
It makes JSVC work under Tru64 (at least for Tomcat:). Purhaps it will be
useful to incorporate it in future releases.
Please CC answers for me, as I am not subscribed to your list.

diff -ur jsvc-src/configure.in jsvc-src.new/configure.in
--- jsvc-src/configure.in       Mon Feb 23 16:43:50 2004
+++ jsvc-src.new/configure.in   Tue Jun  8 12:11:21 2004
@@ -107,7 +107,12 @@
   cd $_prevdir
   unset _prevdir
 else
+if test "$supported_os" = "tru64"
+then
+  CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/alpha"
+else
   CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
+fi
 fi
 
 dnl -------------------------------------------------------------------------
diff -ur jsvc-src/native/location.c jsvc-src.new/native/location.c
--- jsvc-src/native/location.c  Mon Feb 23 16:43:50 2004
+++ jsvc-src.new/native/location.c      Wed Jun  9 10:23:16 2004
@@ -37,6 +37,9 @@
 #elif defined(OS_SYSV)
     "/opt/java",
     "/opt/java/jdk13",
+#elif defined(OS_TRU64)
+    "/usr/opt/java142",
+    "/usr/opt/java13",
 #endif
     NULL,
 };
@@ -49,6 +52,10 @@
 char *location_jvm_cfg[] = {
     "$JAVA_HOME/jre/lib/jvm.cfg", /* JDK */
     "$JAVA_HOME/lib/jvm.cfg",     /* JRE */
+#if defined(OS_TRU64)
+    "$JAVA_HOME/jre/lib/alpha/jvm.cfg", /* JDK */
+    "$JAVA_HOME/lib/alpha/jvm.cfg",     /* JRE */
+#endif
     NULL,
 };
 
@@ -86,6 +93,16 @@
     "$JAVA_HOME/bin/classic/libjvm.so",
     "$JAVA_HOME/bin/client/libjvm.so",
     "$JAVA_HOME/bin/libjvm.so",
+#elif defined(OS_TRU64)
+    "$JAVA_HOME/jre/lib/alpha/classic/libjvm.so",
+    "$JAVA_HOME/jre/lib/alpha/fast64/libjvm.so",
+    "$JAVA_HOME/jre/lib/alpha/fast32/libjvm.so",
+    "$JAVA_HOME/lib/alpha/classic/libjvm.so",
+    "$JAVA_HOME/lib/alpha/fast64/libjvm.so",
+    "$JAVA_HOME/lib/alpha/fast32/libjvm.so",
+    "$JAVA_HOME/lib/classic/libjvm.so",
+    "$JAVA_HOME/lib/fast64/libjvm.so",
+    "$JAVA_HOME/lib/fast32/libjvm.so",
 #endif
     NULL,
 };
@@ -106,6 +123,9 @@
     "$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/green_threads/libjvm.so",
     "$JAVA_HOME/lib/" CPU "/$VM_NAME/dce_threads/libjvm.so",
     "$JAVA_HOME/lib/" CPU "/$VM_NAME/green_threads/libjvm.so",
+#elif defined(OS_TRU64)
+    "$JAVA_HOME/jre/lib/alpha/classic/libjvm.so",
+    "$JAVA_HOME/lib/alpha/classic/libjvm.so",
 #endif
     NULL,
 };
diff -ur jsvc-src/support/apsupport.m4 jsvc-src.new/support/apsupport.m4
--- jsvc-src/support/apsupport.m4       Mon Feb 23 16:43:50 2004
+++ jsvc-src.new/support/apsupport.m4   Wed Jun  9 10:29:30 2004
@@ -79,6 +79,8 @@
     CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
     supported_os="mips"
     ;;
+  alpha*)
+    CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\"" ;;
   *)
     AC_MSG_RESULT([failed])
     AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
@@ -115,6 +117,11 @@
     CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
     LDFLAGS="-pthread $LDFLAGS"
     supported_os="freebsd"
+    ;;
+  osf5*)
+    CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED"
+    supported_os="tru64"
+    LDFLAGS="$LDFLAGS -pthread"
     ;;
   *)
     AC_MSG_RESULT([failed])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]