rebalance a bit between simgrid_config and internal_config

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 6628613..0f4db4c 100644 (file)
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -9,6 +9,8 @@
 #ifndef SIMGRID_PUBLIC_CONFIG_H
 #define SIMGRID_PUBLIC_CONFIG_H
 
+/* This file should only contain public declarations, mainly the definitions of SimGrid modules that were compiled in */
+
 /** Define the version numbers of the used header files. 
     sg_version() can be used to retrieve the version of the dynamic library.
     But actually, if these numbers don't match, SimGrid refuses to start (so you shouldn't have to care about sg_version() yourself) */
@@ -36,19 +38,16 @@
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@
 
-
 /* Whether mallocators were enabled in ccmake or not. */
 #define MALLOCATOR_COMPILED_IN @MALLOCATOR_IS_WANTED@
 
 /* Define if xbt contexts are based on our threads implementation or not */
 #cmakedefine HAVE_THREAD_CONTEXTS @HAVE_THREAD_CONTEXTS@
 
-/* Jedule output  */
-#cmakedefine HAVE_JEDULE @HAVE_JEDULE@
-
 /* Tracking of latency bound */
 #cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@
 
@@ -57,11 +56,12 @@
 
 /* Define to 1 if mmalloc is compiled in. */
 #cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
-/* If Model-Checking support was requested */
-#cmakedefine HAVE_MC @HAVE_MC@
 
-#cmakedefine SIMGRID_HAVE_LIBSIG @SIMGRID_HAVE_LIBSIG@
+#cmakedefine HAVE_JEDULE @HAVE_JEDULE@ /* Was Jedule compiled in?  */
+#cmakedefine HAVE_MC     @HAVE_MC@     /* Was the model-checking compiled in? */
+#cmakedefine HAVE_NS3    @HAVE_NS3@    /* Was the NS3 support compiled in? */
+#cmakedefine HAVE_LUA    @HAVE_LUA@    /* Was the Lua support compiled in? */
 
-#cmakedefine HAVE_VASPRINTF @HAVE_VASPRINTF@
+#cmakedefine SIMGRID_HAVE_LIBSIG @SIMGRID_HAVE_LIBSIG@
 
 #endif /* SIMGRID_PUBLIC_CONFIG_H */

diff --git a/src/portable.h b/src/portable.h
index 570a599..487a6f1 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -10,7 +10,9 @@
 #ifndef SIMGRID_PORTABLE_H
 #define SIMGRID_PORTABLE_H
 
-#include "src/internal_config.h"
+#include "simgrid_config.h"       /* what was compiled in? */
+#include "src/internal_config.h"  /* some information about the environment */
+
 #include "xbt/base.h"
 #include "xbt/misc.h"
 #ifdef _XBT_WIN32

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index f3939f5..187e8ae 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -18,6 +18,7 @@
 #include "instr/instr_interface.h"
 #include "simgrid/simix.h"
 #include "simgrid/sg_config.h"
+#include "simgrid_config.h" /* what was compiled in? */
 #ifdef HAVE_SMPI
 #include "smpi/smpi_interface.h"
 #endif

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 4537df7..50184e6 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -4,6 +4,7 @@
 /* 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 "portable.h"
 #include "surf_private.h"
 #include "surf_interface.hpp"
 #include "network_interface.hpp"
@@ -16,7 +17,6 @@
 #include "virtual_machine.hpp"
 #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 
-
 XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 6e0cfed..76ecb58 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -11,7 +11,7 @@
 #include <stdio.h>              /* snprintf */
 #include <stdlib.h>             /* snprintf */
 
-#include "src/portable.h"           /* to get a working stdarg.h */
+#include "src/portable.h"
 
 #include "src/xbt_modinter.h"
 

diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c
index 22a3aa8..148a593 100644 (file)
--- a/src/xbt/snprintf.c
+++ b/src/xbt/snprintf.c
@@ -49,8 +49,8 @@
  *   http://www.ijs.si/software/snprintf/
  */
 
-#include "xbt/sysdep.h"       /* xbt_abort() */
-#include "simgrid_config.h"   /* Do we need vasprintf? */
+#include "xbt/sysdep.h"           /* xbt_abort() */
+#include "src/internal_config.h"  /* Do we need vasprintf? */
 #include <stdio.h>
 
 #if !defined(HAVE_VASPRINTF)

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 1f52559..de04a60 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -90,12 +90,6 @@
 /* We have mmap and objdump to handle privatization */
 #cmakedefine HAVE_PRIVATIZATION @HAVE_PRIVATIZATION@
 
-/* Indicates that we have NS3 support */
-#cmakedefine HAVE_NS3 @HAVE_NS3@
-
-/* defines whether Lua bindings must be compiled or not */
-#cmakedefine HAVE_LUA @HAVE_LUA@
-
 /* Define to 1 if you have the `makecontext' function. */
 #cmakedefine HAVE_MAKECONTEXT @HAVE_MAKECONTEXT@