Browse Source

Fix testing for need for std=c++11 for simgrid

Samuel Thibault 9 years ago
parent
commit
6ecce4424d
1 changed files with 4 additions and 0 deletions
  1. 4 0
      configure.ac

+ 4 - 0
configure.ac

@@ -1100,8 +1100,12 @@ if test x$enable_simgrid = xyes ; then
 	# Simgrid 3.12 & 3.13 need -std=c++11 to be able to build anything in C++...
 	# Simgrid 3.12 & 3.13 need -std=c++11 to be able to build anything in C++...
 	AC_LANG_PUSH([C++])
 	AC_LANG_PUSH([C++])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			  #ifdef HAVE_SIMGRID_MSG_H
 			  #include <simgrid/msg.h>
 			  #include <simgrid/msg.h>
 			  #include <simgrid/host.h>
 			  #include <simgrid/host.h>
+			  #else
+			  #include <msg/msg.h>
+			  #endif
 			  ]]),],,
 			  ]]),],,
 			  CXXFLAGS="-std=c++11 $CXXFLAGS"
 			  CXXFLAGS="-std=c++11 $CXXFLAGS"
 			  NVCCFLAGS="-std=c++11 $NVCCFLAGS")
 			  NVCCFLAGS="-std=c++11 $NVCCFLAGS")