X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3480003459fd0c8ea061f99d4105b0e4e0c8c..56417ff927246c7dd199fbebda6a49bc34f27950:/examples/java/java_test.mk

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index 1899744e50..cf493036dc 100644
--- a/examples/java/java_test.mk
+++ b/examples/java/java_test.mk
@@ -3,9 +3,8 @@
 # All this to only get a dumb javac *java... Automake still have issues with java
 
 JAVAROOT=.
-CLASSPATH=$(top_srcdir)/src/java
 
-#AM_JAVACFLAGS=-I$(top_srcdir)/src/java
+AM_JAVACFLAGS=-classpath $(top_srcdir)/src/simgrid.jar:.
 
 
 ##########################
@@ -15,9 +14,13 @@ CLASSPATH=$(top_srcdir)/src/java
 # 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=".:$(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