Fix: running java examples out of tree

[lttng-ust.git] / doc / examples / java-log4j / run

diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
index 5e3cbeb4b20e84bb16a9cd2ab9830dde9dfb7318..91f8f5d6b74300996b999f216e31fb2f2c935077 100755 (executable)
--- a/doc/examples/java-log4j/run
+++ b/doc/examples/java-log4j/run
@@ -8,19 +8,28 @@
 
 DIR=`dirname $0`
 JARFILE="liblttng-ust-agent.jar"
-LOG4J="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+JAVA_OPTIONS=""
+
+# If system classpath is empty, try to guess log4j location
+if [ "x$CLASSPATH" = "x" ]; then
+       CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+fi
 
 cd $DIR
 
 if [ -f "$DIR/.intree" ]; then
-       CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$LOG4J"
+       CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$CLASSPATH"
        LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
 else
-       CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$LOG4J"
+       CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH"
        # Use system defined java.library.path
        #LIBPATH="/usr/local/lib:/usr/lib"
 fi
 
-java -classpath "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
+if [ "x$LIBPATH" != "x" ]; then
+       JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=\"$LIBPATH\""
+fi
+
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
 
 cd -