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 8b7d328470eae97fe0de439f02c637704ce4ccb4..7f31f36c793d3a6903cffa26a87c241d954905fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -359,6 +359,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 2ba8cd89462a8b2a7f5a65f6e5f296ff76fa789d..c63679767d51c2f5d58431f3b08ca300361657d5 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -147,6 +147,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) \
@@ -158,6 +159,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.