load public config from internal config

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73477bf..c22fc86 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -894,7 +894,7 @@ message("##########################################")
 message("#### Content of src/internal_config.h ####")
 message("##########################################")
 file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h config_output)
-LIST(REMOVE_AT config_output 0 1 2 3 4 5 6 7 8) # Pass the file header
+LIST(REMOVE_AT config_output 0 1 2 3 4 5 6 7 8 9 10) # Pass the file header
 foreach(line ${config_output})
   message("   ${line}")
 endforeach()

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 4749db6..e440d19 100644 (file)
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -21,7 +21,7 @@
 
 #define HAVE_JEDULE     @HAVE_JEDULE@ /* Was Jedule compiled in?  */
 #define HAVE_LUA        @HAVE_LUA@ /* Was the Lua support compiled in? */
-#define HAVE_MALLOCATOR @HAVE_MALLOCATOR@ /* Whether mallocators (object pools) were activated at compilation time. */
+#define HAVE_MALLOCATOR @HAVE_MALLOCATOR@ /* Were mallocators (object pools) compiled in? */
 #define HAVE_MC         @HAVE_MC@ /* Was the model-checking compiled in? */
 #define HAVE_NS3        @HAVE_NS3@ /* Was the NS3 support compiled in? */
 

diff --git a/src/portable.h b/src/portable.h
index c3ece3f..c9a77e3 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -8,7 +8,6 @@
 #ifndef SIMGRID_PORTABLE_H
 #define SIMGRID_PORTABLE_H
 
-#include "simgrid_config.h"       /* what was compiled in? */
 #include "src/internal_config.h"  /* some information about the environment */
 
 #ifdef _WIN32
@@ -24,9 +23,8 @@
 
 /* File handling */
 #ifdef _WIN32
-  #ifdef S_IRGRP
-    #undef S_IRGRP
+  #ifndef S_IRGRP
+    #define S_IRGRP 0
   #endif
-  #define S_IRGRP 0
 #endif
 #endif                          /* SIMGRID_PORTABLE_H */

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 817f0fc..e632714 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -8,6 +8,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid_config.h"       /* what was compiled in? */
+
 /* Non-standard header files */
 #define HAVE_EXECINFO_H @HAVE_EXECINFO_H@ /* <execinfo.h> */
 #define HAVE_FUTEX_H    @HAVE_FUTEX_H@ /* <linux/futex.h> */