fix: Add CLASSPATH to autoconf precious variables

This will record the value of CLASSPATH in the autoconf cache and ensure
it's used when calling make even if it's not exported to the
environment.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ia06070dd352f9d3b6956a1ec0f4eb1d024f73179

diff --git a/configure.ac b/configure.ac
index 400feadd37ea5615cf7727a413cb600f5a31311f..eb1bb3e6b52a51bdaf878dafe73e3af395e8b9c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -371,6 +371,7 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te
        AX_PROG_JAVAC
        AX_PROG_JAVA
        AX_PROG_JAR
+       AC_ARG_VAR([CLASSPATH], [Java class path])
 
        AX_JNI_INCLUDE_DIR
        for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 503ee81509dd5be46b7e5a70f53592326fb1b1ff..70ebe195c002573f543d972caf70549eaaefbcce 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -149,6 +149,7 @@ all-local:
                        ( \
                                cd $$subdir && \
                                $(MAKE) all \
+                                       CLASSPATH="$(CLASSPATH)" \
                                        JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" \
                                        JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \
                                        $(AM_MAKEFLAGS) \
@@ -160,6 +161,7 @@ all-local:
                        ( \
                                cd $$subdir && \
                                $(MAKE) all \
+                                       CLASSPATH="$(CLASSPATH)" \
                                        JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \
                                        JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \
                                        $(AM_MAKEFLAGS) \

diff --git a/doc/examples/java-log4j/Makefile b/doc/examples/java-log4j/Makefile
index bf10fc525b4b6f717f7aa8dcf333c8eaa672ec29..59ffdf79c2ed95dc322c7733dfffad669fb83948 100644 (file)
--- a/doc/examples/java-log4j/Makefile
+++ b/doc/examples/java-log4j/Makefile
@@ -22,7 +22,7 @@ JARFILE_COMMON=lttng-ust-agent-common.jar
 
 # If system classpath is empty, try to guess log4j location
 ifeq "$(CLASSPATH)" ""
-       CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+       CLASSPATH=/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar
 endif
 
 # Check if the top level makefile overrides the Log4j Jar file's path.