Hi,
Any objections for committing this patch?
It sets LD_LIBRARY_PATH to include CATALINA_HOME/native
if CATALINA_HOME/native/libtcnative-1.so is present.
Index: C:/U/SVN/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
===================================================================
--- C:/U/SVN/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
(revision 376293)
+++ C:/U/SVN/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
(working copy)
@@ -116,6 +116,18 @@
fi
fi
+if [ -z "$CATALINA_NATIVE" ] ; then
+ # Define the path for Tomcat Native APR.
+ CATALINA_NATIVE="$CATALINA_HOME"/native
+fi
+if [ -r "$CATALINA_NATIVE"/libtcnative-1.so ]; then
+ if [ -n "$LD_LIBRARY_PATH" ] ; then
+ LD_LIBRARY_PATH=$CATALINA_NATIVE:$LD_LIBRARY_PATH
+ else
+ LD_LIBRARY_PATH=$CATALINA_NATIVE
+ fi
+fi
+
# Add on extra jar files to CLASSPATH
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
@@ -153,6 +165,7 @@
echo "Using CATALINA_BASE: $CATALINA_BASE"
echo "Using CATALINA_HOME: $CATALINA_HOME"
echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
+echo "Using CATALINA_NATIVE: $CATALINA_NATIVE"
if [ "$1" = "debug" -o "$1" = "javac" ] ; then
echo "Using JAVA_HOME: $JAVA_HOME"
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
