From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 24 Mar 2010 16:14:23 +0000 (+0000)
Subject: Changes way to find lualib.h and lauxlib.h.
X-Git-Tag: SVN~383
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8bf7c810ed53b509cc062dff51830ec5b2d72405

Changes way to find lualib.h and lauxlib.h.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7357 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 6b7aa7f43a..d950d6937b 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -210,8 +210,8 @@ if(NOT disable_lua)
 	)
 	if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 		set(HAVE_LUA 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} ")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} ")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
 	endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 endif(NOT disable_lua)
 #message("HAVE_LUA ${HAVE_LUA}")
diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 013739d863..e3a87e8fdd 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -6,8 +6,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 #include "msg/msg.h"
 #include "xbt.h"
diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 71c2b0edeb..601736e980 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -12,7 +12,7 @@
 #include "private.h"
 
 #ifdef HAVE_LUA
-#include <lua5.1/lauxlib.h>
+#include <lauxlib.h>
 #endif
 
 #ifdef HAVE_RUBY
diff --git a/src/simix/smx_context_lua.c b/src/simix/smx_context_lua.c
index 5d5d376724..50ec2402b0 100644
--- a/src/simix/smx_context_lua.c
+++ b/src/simix/smx_context_lua.c
@@ -5,8 +5,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 <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 /* lua can run with ultra tiny stacks since the user code lives in lua stacks, not the main one */
 //#define CONTEXT_STACK_SIZE 4*1024