configure: remove redundant section

One of the last merges introduced duplicate Lua config sections. Just
use the standard one (but turn lua support on by default).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a07aa2acd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-01 16:00:33 +01:00
parent cc7903aebd
commit 0655fccd35
3 changed files with 8 additions and 19 deletions

View File

@@ -116,19 +116,6 @@ if test "$BOXTYPE" = "coolstream"; then
TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray) TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
fi 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" || if test "$BOXTYPE" = "coolstream" ||
test "$BOXTYPE" = "tripledragon" || test "$BOXTYPE" = "tripledragon" ||
test "$BOXTYPE" = "spark"; then test "$BOXTYPE" = "spark"; then
@@ -236,8 +223,8 @@ fi
# Lua - embeddable scripting language # Lua - embeddable scripting language
AC_ARG_ENABLE(lua, AC_ARG_ENABLE(lua,
AS_HELP_STRING(--enable-lua,include Lua support), AS_HELP_STRING(--disable-lua,disable Lua support),
,[enable_lua=no]) ,[enable_lua=yes])
AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes") AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
if test "$enable_lua" = "yes"; then if test "$enable_lua" = "yes"; then

View File

@@ -69,10 +69,10 @@ MTDUTILSLIBS = \
system/mtdutils/lib/libneutrino_system_mtdutils_lib.a system/mtdutils/lib/libneutrino_system_mtdutils_lib.a
endif endif
#if ENABLE_LUA if ENABLE_LUA
LUALIBS = \ LUALIBS = \
gui/lua/libneutrino_gui_lua.a gui/lua/libneutrino_gui_lua.a
#endif endif
neutrino_LDADD = \ neutrino_LDADD = \
daemonc/libneutrino_daemonc.a \ daemonc/libneutrino_daemonc.a \
@@ -133,7 +133,9 @@ neutrino_LDADD += -lgif
else else
neutrino_LDADD += -lungif neutrino_LDADD += -lungif
endif endif
if ENABLE_LUA
neutrino_LDADD += @LUA_LIBS@ neutrino_LDADD += @LUA_LIBS@
endif
if ENABLE_UPNP if ENABLE_UPNP
neutrino_LDADD += \ neutrino_LDADD += \

View File

@@ -16,9 +16,9 @@ noinst_HEADERS = version.h
SUBDIRS = bedit components widget SUBDIRS = bedit components widget
#if ENABLE_LUA if ENABLE_LUA
SUBDIRS += lua SUBDIRS += lua
#endif endif
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-I$(top_builddir) \ -I$(top_builddir) \