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

[simgrid.git] / include / simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 279ba46..47e50f5 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) */
@@ -30,65 +32,32 @@
                                              SIMGRID_VERSION_MINOR, \
                                              SIMGRID_VERSION_PATCH)
 
-/* take care of DLL usage madness */
-
-#ifdef _XBT_DLL_EXPORT
-       #ifndef DLL_EXPORT
-               #define DLL_EXPORT
-       #endif
-#else
-       #ifdef _XBT_DLL_STATIC
-               #ifndef DLL_STATIC
-                       #define DLL_STATIC
-               #endif
-       #else
-               #ifndef DLL_EXPORT
-                       #define DLL_IMPORT
-               #endif
-       #endif
-#endif
-
 #cmakedefine _XBT_WIN32 @_XBT_WIN32@   /*this variable is set if it is a windows platform*/
 #cmakedefine _WIN32 @_WIN32@                   /*this variable is set if it is a 32 bits windows platform*/
 #cmakedefine _WIN64 @_WIN64@                   /*this variable is set if it is a 64 bits  windows platform*/
-#cmakedefine __VISUALC__ @__VISUALC__@
-#ifdef _XBT_WIN32
-       #ifndef __GNUC__
-               #cmakedefine __GNUC__ @__GNUC__@
-       #endif
-#endif
 
 /* 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@
 
-/* Define to 1 if mmalloc is compiled in. */
-#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
-
-/* Get the config */
-#undef SIMGRID_NEED_ASPRINTF
-#undef SIMGRID_NEED_VASPRINTF
-@simgrid_need_asprintf@
-@simgrid_need_vasprintf@
-
 /* 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@
-
 /* If __thread is available */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@
 
-/* If Model-Checking support was requested */
-#cmakedefine HAVE_MC @HAVE_MC@
+/* Define to 1 if mmalloc is compiled in. */
+#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
+
+#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 SIMGRID_HAVE_LIBSIG @SIMGRID_HAVE_LIBSIG@