Stop bugging me with java when I don't want it.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3800 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index 7ee887b..4081a37 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -432,6 +432,15 @@ AC_CONFIG_FILES([
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 
 #      examples/gras/p2p/chord/Makefile
 #      examples/gras/p2p/can/Makefile
 

+if test "x$use_java" = "xyes" ; then
+AC_CONFIG_FILES([
+    examples/java/Makefile
+      examples/java/basic/Makefile
+      examples/java/comm_time/Makefile
+      examples/java/suspend/Makefile
+      examples/java/ping_pong/Makefile
+])
+fi

 
 AC_CONFIG_FILES([
   examples/Makefile 
 
 AC_CONFIG_FILES([
   examples/Makefile 


@@ -453,11 +462,6 @@ AC_CONFIG_FILES([
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
       examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
       examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl

-    examples/java/Makefile
-      examples/java/basic/Makefile
-      examples/java/comm_time/Makefile
-      examples/java/suspend/Makefile
-      examples/java/ping_pong/Makefile

 ],[
     for file in                                                 \
      \
 ],[
     for file in                                                 \
      \

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 77125cf..ce5e901 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,6 @@
-SUBDIRS= msg gras amok simdag java
+SUBDIRS= msg gras amok simdag 
+if HAVE_JAVA
+  SUBDIRS+= java
+endif

 
 include $(top_srcdir)/acmacro/dist-files.mk
 
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 682c85b..70f53d8 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -37,6 +37,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@

+@HAVE_JAVA_TRUE@am__append_1 = java

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/acmacro/dist-files.mk
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/acmacro/dist-files.mk
 subdir = examples


@@ -67,7 +68,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags

-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = msg gras amok simdag java

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADDR2LINE = @ADDR2LINE@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADDR2LINE = @ADDR2LINE@


@@ -205,7 +206,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@

-SUBDIRS = msg gras amok simdag java
+SUBDIRS = msg gras amok simdag $(am__append_1)

 all: all-recursive
 
 .SUFFIXES:
 all: all-recursive
 
 .SUFFIXES: