Somehow fix the ruby detection with autotools. Still doesn't compile for some reason...

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 0c1387418ba7bc8e219362f14255af95c7fa5042..70a41babaf6f77e8bb5793c29e4db3c4081094e5 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,14 +10,32 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "private.h"
+#include <lua5.1/lauxlib.h>
 
+
+#ifdef HAVE_RUBY
+/* Damn Ruby. They load their full config.h, which breaks since we also load ours.
+ * So, we undef the offending defines
+ */
+#undef PACKAGE_VERSION
+#undef PACKAGE_NAME
+#undef PACKAGE_TARNAME
+#undef PACKAGE_STRING
+#undef PACKAGE_BUGREPORT
+#undef _GNU_SOURCE
+#include <ruby.h>
+ void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory);
+#include "smx_context_ruby.c"
+#endif 
+ 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism");
 
 const char *xbt_ctx_factory_to_use = NULL;
 
-/**
+/** 
  * This function is call by SIMIX_global_init() to initialize the context module.
  */
+
 void SIMIX_context_mod_init(void)
 {
   if (!simix_global->context_factory) {
@@ -64,6 +82,8 @@ int SIMIX_context_select_factory(const char *name)
      newly selected one, then kill all the processes, exit the context module
      and initialize the new factory.
   */
+  
+
   if (simix_global->context_factory != NULL) {
     if (strcmp(simix_global->context_factory->name, name)){
 
@@ -85,6 +105,8 @@ int SIMIX_context_select_factory(const char *name)
   SIMIX_context_init_factory_by_name(&simix_global->context_factory, name);
 
   SIMIX_create_maestro_process ();
+
+
   
   return 0;
 }
@@ -95,6 +117,7 @@ int SIMIX_context_select_factory(const char *name)
 void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
                                         const char *name)
 {
+  
   if (!strcmp(name, "java"))
 #ifdef HAVE_JAVA     
     SIMIX_ctx_java_factory_init(factory);
@@ -116,7 +139,19 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
       THROW0(not_found_error, 0, "Factory 'sysv' does not exist: no System V thread support under Windows");
   #endif
     else if (!strcmp(name, "lua"))
+#ifdef HAVE_LUA
       SIMIX_ctx_lua_factory_init(factory);
+#else
+
+    THROW0(not_found_error, 0, "Factory 'lua' does not exist: Lua support was not compiled in the SimGrid library");
+#endif /* HAVE_LUA */
+
+    else if (!strcmp(name,"ruby"))
+#ifdef HAVE_RUBY
+    SIMIX_ctx_ruby_factory_init(factory);
+#else
+     THROW0(not_found_error, 0, "Factory 'ruby' does not exist: Ruby support was not compiled in the SimGrid library");
+#endif
   else
     THROW1(not_found_error, 0, "Factory '%s' does not exist", name);
 }