mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

lua: detect if static or dynamic linking is wanted

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-26 01:25:06 +01:00
parent 78f51baf66
commit 899837e003
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -110,6 +110,7 @@ PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [ PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [
echo "=> lualib not found, assuming static lua in linker path..." echo "=> lualib not found, assuming static lua in linker path..."
LUA_LIBS="-llua -ldl" LUA_LIBS="-llua -ldl"
AC_DEFINE(STATIC_LUAPOSIX,1,[Define to 1 for static lua build.])
]) ])
]) ])

4
src/gui/luainstance.cpp
View File

@@ -347,7 +347,7 @@ const luaL_Reg CLuaInstance::methods[] =
{ NULL, NULL } { NULL, NULL }
}; };
#ifndef DYNAMIC_LUAPOSIX #ifdef STATIC_LUAPOSIX
/* hack: we link against luaposix, which is included in our /* hack: we link against luaposix, which is included in our
* custom built lualib */ * custom built lualib */
extern "C" { LUAMOD_API int (luaopen_posix_c) (lua_State *L); } extern "C" { LUAMOD_API int (luaopen_posix_c) (lua_State *L); }
@@ -384,7 +384,7 @@ void CLuaInstance::registerFunctions()
luaopen_io(lua); luaopen_io(lua);
luaopen_string(lua); luaopen_string(lua);
luaopen_math(lua); luaopen_math(lua);
#ifndef DYNAMIC_LUAPOSIX #ifdef STATIC_LUAPOSIX
luaopen_posix_c(lua); luaopen_posix_c(lua);
#else #else
dolibrary(lua,"posix"); dolibrary(lua,"posix");