X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff1d0c3097e0e9f7f35cec9de334417c747a8e34..e2116b664b780d9d8d3066b8f69a4accc533fd12:/configure.ac?ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 831dc0f8e4..b66c77de25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,13 +182,34 @@ AC_ARG_ENABLE(simix,
   AS_HELP_STRING([--enable-simix], [Use the new SimIX module (default=no)]),
   enable_simix=$enableval,enable_simix=no)
 if test "x$enable_simix" = "xyes" ; then
-  AC_MSG_RESULT("***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****")
+  AC_MSG_RESULT(***** You have decided to use the experimental SimIX. We hope you know what you're doing.. ****)
   AC_DEFINE(USE_SIMIX, 1, [Indicates whether we should use SimIX or not])
 else 
-  AC_MSG_RESULT(Eventually you will come to SimIX: x$enable_simix)
+  AC_MSG_RESULT(Eventually you will come to SimIX.)
 fi
 AM_CONDITIONAL(USE_SIMIX,test x$enable_simix != xno)
 
+#########################################
+## Build optional modules (gtnets)
+##
+AC_ARG_WITH(gtnets,
+  AS_HELP_STRING([--with-gtnets], [Path to GTNetS installation (default to empty, ie not using GTNetS)]),
+  gtnets_path="$withval",gtnets_path="NO")
+if test "x$gtnets_path" = "xNO" ; then
+  AC_MSG_RESULT(Eventually you will come to GTNetS.)
+else  
+  AC_MSG_RESULT(***** You have decided to use the experimental GTNetS. We hope you know what you're doing.. ****)
+  AC_DEFINE(USE_GTNETS, 1, [Indicates whether we should use GTNetS or not])
+  if ! test -e $gtnets_path ; then
+    AC_MSG_ERROR(Provided path to GTNetS include files ($gtnets_path) do not exist!)
+  fi
+  GTNETS_CFLAGS=-I$gtnets_path/include
+  AC_SUBST([GTNETS_CFLAGS])  
+  GTNETS_LDFLAGS=-L$gtnets_path/lib
+  AC_SUBST([GTNETS_LDFLAGS])  
+fi
+AM_CONDITIONAL(USE_GTNETS,test "x$gtnets_path" != xNO)
+
 #########################################
 ## Check for libraries extra-dependencies
 ##
@@ -383,23 +404,26 @@ AC_CONFIG_FILES([
 
 # Examples
 
+#      examples/gras/p2p/Makefile
+#      examples/gras/p2p/chord/Makefile
+#      examples/gras/p2p/can/Makefile
+
 AC_CONFIG_FILES([
   examples/Makefile 
     examples/msg/Makefile
+      examples/msg/basic.tesh         examples/msg/small_plat.tesh 
+      examples/msg/suspend.tesh       examples/msg/flexml_bypass.tesh 
     examples/simdag/Makefile	    examples/simdag/test_simdag
-    examples/gras/Makefile 
-      examples/gras/ping/Makefile   examples/gras/ping/test_sg   examples/gras/ping/test_rl
-      examples/gras/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/test_rl
-      examples/gras/timer/Makefile  examples/gras/timer/test_sg  examples/gras/timer/test_rl
-      examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
-      examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl
-      examples/gras/mmrpc/Makefile  examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl
-      examples/gras/pmm/Makefile    examples/gras/pmm/test_sg    examples/gras/pmm/test_rl
-      examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
-
-      examples/gras/p2p/Makefile
-      examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
-      examples/gras/p2p/can/Makefile   examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl
+    examples/gras/Makefile
+      examples/gras/ping/Makefile   
+      examples/gras/rpc/Makefile
+      examples/gras/timer/Makefile
+      examples/gras/chrono/Makefile
+      examples/gras/mutual_exclusion/simple_token/Makefile
+      examples/gras/mmrpc/Makefile
+      examples/gras/pmm/Makefile
+      examples/gras/all2all/Makefile
+
       
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
@@ -407,19 +431,6 @@ AC_CONFIG_FILES([
 ],[
     for file in                                                 \
      \
-     examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
-     examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
-     \
-     examples/gras/ping/test_sg   examples/gras/ping/test_rl    \
-     examples/gras/rpc/test_sg    examples/gras/rpc/test_rl     \
-     examples/gras/timer/test_sg  examples/gras/timer/test_rl   \
-     examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
-     examples/gras/mutual_exclusion/simple_token/test_sg examples/gras/mutual_exclusion/simple_token/test_rl  \
-     examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
-     examples/gras/pmm/test_sg    examples/gras/pmm/test_rl     \
-     examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \
-     examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
-     examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl  \
      examples/msg/run_msg_test                                  \
      examples/simdag/test_simdag				\
     ; do                                                        \
@@ -427,14 +438,6 @@ AC_CONFIG_FILES([
     done
 ])
 
-#     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
-#    examples/gras/pastry/test_sg   
-
-
-
-#    examples/gras/saturate/Makefile  examples/gras/saturate/test_sg
-#    examples/gras/alnem/Makefile     examples/gras/alnem/test_sg
-
 
 # GRAMINE_CUT_END