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

configure: remove redundant section

Browse Source 
One of the last merges introduced duplicate Lua config sections. Just
use the standard one (but turn lua support on by default).
This commit is contained in:
Stefan Seyfried
2016-01-01 16:00:33 +01:00
parent 74293c13b6
commit 0a07aa2acd
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@@ -116,19 +116,6 @@ if test "$BOXTYPE" = "coolstream"; then
TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
fi
# either use dynamic lualib in package lua (openSUSE)
# ... or in package lua5.2 (debian-derivates)
# ... and if all fails, assume it is in the linker path (cross build)
PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [
echo "=> lualib not found, assuming static lua in linker path..."
LUA_LIBS="-llua -ldl"
AC_DEFINE(STATIC_LUAPOSIX,1,[Define to 1 for static lua build.])
])
])
# hack...
AC_DEFINE(LUA_COMPAT_5_2,1,[does not really belong in config.h, but is needed for build with lua 5.3+])
if test "$BOXTYPE" = "coolstream" ||
test "$BOXTYPE" = "tripledragon" ||
test "$BOXTYPE" = "spark"; then
@@ -236,8 +223,8 @@ fi
# Lua - embeddable scripting language
AC_ARG_ENABLE(lua,
AS_HELP_STRING(--enable-lua,include Lua support),
,[enable_lua=no])
AS_HELP_STRING(--disable-lua,disable Lua support),
,[enable_lua=yes])
AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
if test "$enable_lua" = "yes"; then