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 9012803..61ef0ab 100644 (file)
--- 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);
 
   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();
     MC_do_the_modelcheck_for_real();
   } else {
     SIMIX_run();

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 299219f..b9e903b 100644 (file)
--- 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);
 
                      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",
     /* 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);
                      "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;
 
     /* do verbose-exit */
     default_value_int = 1;