From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 22 Jun 2012 07:59:23 +0000 (+0200)
Subject: oops, we broke non-model-checking builds yesterday. Sorry guys
X-Git-Tag: v3_8~498
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7ee2063d69289e99a0900135ba1625ac0bc514e0

oops, we broke non-model-checking builds yesterday. Sorry guys
---

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 9012803624..61ef0ab9d0 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -108,7 +108,7 @@ MSG_error_t MSG_main(void)
   fflush(stdout);
   fflush(stderr);
 
-  if (MC_IS_ENABLED && (_surf_do_model_check == 1)) {
+  if (MC_IS_ENABLED) {
     MC_do_the_modelcheck_for_real();
   } else {
     SIMIX_run();
diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 299219f4e1..b9e903bd36 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -474,6 +474,7 @@ void surf_config_init(int *argc, char **argv)
                      xbt_cfgelm_int, &default_value_int, 0, 1,
                      NULL, NULL);
 
+#if HAVE_MC
     /* do model-checking */
     default_value_int = 0;
     xbt_cfg_register(&_surf_cfg_set, "model-check",
@@ -502,6 +503,7 @@ void surf_config_init(int *argc, char **argv)
                      "Specify the kind of exploration reduction (either none or DPOR)",
                      xbt_cfgelm_string, &default_value, 0, 1,
                      _mc_cfg_cb_reduce, NULL);
+#endif
 
     /* do verbose-exit */
     default_value_int = 1;