split the MSG tesh test in several files, and get them reworked by autoconf so that...

[simgrid.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 953843b..a46b6b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 ##
 
 AC_PREREQ(2.59)
-AC_INIT([simgrid],[3.2-cvs],[simgrid-devel@lists.gforge.inria.fr])
+AC_INIT([simgrid],[3.3-cvs],[simgrid-devel@lists.gforge.inria.fr])
 AC_CONFIG_SRCDIR([include/gras.h])
 AC_CONFIG_HEADERS([src/gras_config.h])
 # A CI_PREREQ(2003.01.16) # We need a recent ACI when having sub-modules
@@ -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
 ##
@@ -343,8 +364,8 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([
   tools/Makefile
     tools/gras/Makefile
+    tools/tesh/Makefile
 ])
-dnl tools/tesh/Makefile
 
 
 # GRAMINE_CUT_BEGIN
@@ -385,7 +406,9 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([
   examples/Makefile 
-    examples/msg/Makefile           examples/msg/run_msg_test
+    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
@@ -456,9 +479,10 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
 if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then
   echo "WARNING:"
   echo "WARNING: you seem to compile the CVS version without the maintainer mode."
-  echo "WARNING: You may want to enable this by specifying:"
+  echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). "
+  echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:"
   echo "WARNING:"
-  echo "WARNING: ./configure --enable-maintainer-mode  $ac_configure_args"
+  echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args"
   echo "WARNING:"
 fi
 echo $build_id > stamp.configure