From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 3 Feb 2011 16:04:43 +0000 (+0100)
Subject: Make build work with latest developments on simgrid-svn.
X-Git-Tag: v0.1~183
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/596a21890fc3cae8f7ec57c76224b300c246ed1f?ds=inline

Make build work with latest developments on simgrid-svn.
---

diff --git a/Makefile b/Makefile
index 2760531..ff9ad97 100644
--- 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 8aef329..a12af19 100644
--- 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