X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40a6b57b33ba92df9a10600b8d6fa10fff80c9d2..e9f853f7336f26b6e03a7a080ece1a25b20a5181:/src/simgrid/sg_config.c?ds=sidebyside

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 84d49b5a73..04554824e9 100644
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -18,7 +18,9 @@
 #include "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "simgrid/sg_config.h"
+#ifdef HAVE_SMPI
 #include "smpi/smpi_interface.h"
+#endif
 #include "mc/mc.h"
 #include "mc/mc_record.h"
 #include "simgrid/instr.h"
@@ -377,17 +379,6 @@ static void _sg_cfg_cb_model_check_replay(const char *name, int pos)
   MC_record_path = xbt_cfg_get_string(_sg_cfg_set, name);
 }
 
-static void _sg_cfg_cb_model_check(const char *name, int pos)
-{
-#ifdef HAVE_MC
-  _sg_do_model_check = xbt_cfg_get_boolean(_sg_cfg_set, name);
-#else
-  if (xbt_cfg_get_boolean(_sg_cfg_set, name)) {
-    xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again");
-  }
-#endif
-}
-
 static void _sg_cfg_cb_model_check_record(const char *name, int pos)
 {
 #ifdef HAVE_MC
@@ -615,12 +606,6 @@ void sg_config_init(int *argc, char **argv)
       xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay, NULL);
 
 #ifdef HAVE_MC
-    /* do model-checking */
-    xbt_cfg_register(&_sg_cfg_set, "model-check",
-                     "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)",
-                     xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_model_check, NULL);
-    xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", "no");
-
     /* do model-checking-record */
     xbt_cfg_register(&_sg_cfg_set, "model-check/record",
                      "Record the model-checking paths",