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

diff --combined CMakeLists.txt
index 3904250,e46f6b8..c5a2b3c
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -153,7 -153,6 +153,7 @@@ set(INCLUDE
    ${CMAKE_HOME_DIRECTORY}
    ${CMAKE_HOME_DIRECTORY}/include
    ${CMAKE_HOME_DIRECTORY}/src/include
 +  ${CMAKE_BINARY_DIR}
    ${CMAKE_BINARY_DIR}/include
    )
  
@@@ -238,6 -237,18 +238,6 @@@ include(CheckSymbolExists
  include(FindGraphviz)
  include(FindLibSigc++)
  
 -if(enable_java)
 -  find_package(Java REQUIRED COMPONENTS Runtime Development)
 -  find_package(JNI REQUIRED)
 -  message("-- [Java] JNI found: ${JNI_FOUND}")
 -  message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
 -  if(enable_maintainer_mode)
 -    find_package(SWIG REQUIRED)
 -    include(UseSWIG)
 -    message("-- [Java] Swig found: ${SWIG_FOUND} (version ${SWIG_VERSION})")
 -  endif()
 -  set(HAVE_Java 1)
 -endif()
  if(enable_scala)
    find_package(Scala REQUIRED)
    message("-- [Scala] scalac found: ${SCALA_COMPILE}")
@@@ -423,14 -434,12 +423,12 @@@ endif(
  
  if(enable_smpi)
    include(FindGFortran)
-   #really checks for objdump for privatization
-   find_package(BinUtils QUIET)
-   mark_as_advanced(BinUtils_DIR)
    SET(HAVE_SMPI 1)
- 
-   if( NOT "${CMAKE_OBJDUMP}" MATCHES "CMAKE_OBJDUMP-NOTFOUND" AND HAVE_MMAP)
+   if("${CMAKE_SYSTEM}" MATCHES "Linux")
+     SET(USE_LIBUTIL 0)
      SET(HAVE_PRIVATIZATION 1)
-   else()
+   elseif("${CMAKE_SYSTEM}" MATCHES "^FreeBSD")
+     SET(USE_LIBUTIL 0)
      SET(HAVE_PRIVATIZATION 0)
    endif()
  endif()