Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc CMakeLists.txt
index 3973529,3fdc359..c6a6618
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -367,29 -370,21 +363,35 @@@ else(
    SET(HAVE_MALLOCATOR 0)
  endif()
  
 -if(enable_model-checking AND HAVE_MMALLOC)
 +include(FindLibunwind)
 +if(HAVE_LIBUNWIND)
 +  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
 +  # This supposes that the host machine is either an AMD or a X86.
 +  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
 +  if(PROCESSOR_x86_64)
 +    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
 +  else()
 +    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
 +  endif()
 +else()
 +  if(enable_model-checking)
 +    message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
 +  endif()
 +endif()
 +
+ if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
+   message(WARNING "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}: disabling it")
+   set(enable_model-checking FALSE)
+   set(HAVE_MC 0)
+ endif()
++
 +if(enable_model-checking)
    SET(HAVE_MC 1)
 -  include(FindLibunwind)
 -  include(FindLibdw)
 +  
 +  include(FindLibdw)  
 +  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
  else()
 -  if(enable_model-checking)
 -    message(STATUS "Warning: support for model-checking has been disabled because you are missing either mmap or __thread.")
 -  endif()
 -  SET(HAVE_MC 0)
 -  SET(HAVE_MMALLOC 0)
 +  SET(HAVE_MC 0)  
  endif()
  
  if (enable_model-checking AND enable_ns3)

diff --cc tools/cmake/MakeLib.cmake
index 95ce460,19f9452..67b6933
--- 1/tools/cmake/MakeLib.cmake
--- 2/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@@ -69,8 -70,25 +69,8 @@@ if(HAVE_GRAPHVIZ
    endif()
  endif()
  
 -if(HAVE_MC)
 -  # The availability of libunwind was checked in CompleteInFiles.cmake
 -  #   (that includes FindLibunwind.cmake), so simply load it now.
 -
 -  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
 -
 -  # Same for libdw
 -  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
 -  # This supposes that the host machine is either an AMD or a X86.
 -  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
 -  if(PROCESSOR_x86_64)
 -    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
 -  else()
 -    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
 -  endif()
 -endif()
 -
  if(HAVE_MC AND HAVE_GNU_LD)
-   SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl")
+   SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
  endif()
  
  if(HAVE_NS3)

diff --cc tools/cmake/src/internal_config.h.in
Simple merge