Make build work with latest developments on simgrid-svn.

diff --git a/Makefile b/Makefile
index 276053128325715e7761bb88b7c0245a81846888..ff9ad97314e8dfd51f85eca7b298cea4d1b6c924 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ $(FLAVOURED_LOBA):
        $(MAKE) clean
 
 misc_autogen.h: $(SIMGRID_INSTALL_DIR)/include/xbt/log.h
-       grep -C1 '# *define *CLOG' $< \
+       grep '# *define *\(XBT_\)\?CLOG.*_XBT_LOGV' $< \
        | sed 's/CLOG/XCLOG/;s/_XBT_LOGV\(([^)]*)\)/(*\1)/' > $@
 
 version.o: $(patsubst %.cpp,%.o,$(filter-out version.cpp, $(SRC.loba)))

diff --git a/simgrid_features.h b/simgrid_features.h
index 8aef329affebe696888d1f03621b16561c72a3b3..a12af19d10b4b7ae8eee42ae1d452a5b501e33a8 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -6,7 +6,7 @@
 //
 // Use some define introduced after that.               fixme: dirty hack
 //
-#if defined(XBT_RUNNING_CTX_INITIALIZER)
+#if defined(SIMGRID_VERSION)
 #  define MSG_WAIT_DESTROYS_COMMS 0
 #else
 #  define MSG_WAIT_DESTROYS_COMMS 1