X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65e7ca8076e559ed654d1aa20152072b6fbdc9d9..bce27d210ec8c96036b6481dff5c8d3466f4ee75:/examples/java/java_test.mk

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index 0f6e1f6273..90a568c6b0 100644
--- a/examples/java/java_test.mk
+++ b/examples/java/java_test.mk
@@ -4,7 +4,7 @@
 
 JAVAROOT=.
 
-AM_JAVACFLAGS=-classpath $(top_srcdir)/src/simgrid.jar:.
+AM_JAVACFLAGS=-classpath .:$(top_srcdir)/src/simgrid.jar:../../../src/simgrid.jar:..
 
 
 ##########################
@@ -14,9 +14,13 @@ AM_JAVACFLAGS=-classpath $(top_srcdir)/src/simgrid.jar:.
 # We need to override the CLASSPATH to add simgrid.jar and current dir to the picture
 # We also need to express dependencies manually (in each test dir)
 # Damn...
-TESTS_ENVIRONMENT=LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
-                  CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
-                  $(srcdir)/../runtest 
+if HAVE_JAVA
+  TESTS_ENVIRONMENT=LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
+                    CLASSPATH=".:../../../src/simgrid.jar:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
+                    $(srcdir)/../runtest 
+else
+  TESTS_ENVIRONMENT=DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest 
+endif
 
 # declare that we must recompile everything before lauching tests
 $(TESTS): classnoinst.stamp