configure: try to autodetect lualib

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c3c93e7db
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-05-27 13:36:50 +02:00
parent 261cfec6a8
commit 3cfec55382
3 changed files with 15 additions and 1 deletions

View File

@@ -65,6 +65,17 @@ if test x$BOXTYPE = xgeneric; then
# needed by libstb-hal's cVideo / GLFramebuffer
TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
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"
])
])
#TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
#TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection)
#TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver)
@@ -193,6 +204,8 @@ AC_SUBST(VORBISIDEC_CFLAGS)
AC_SUBST(VORBISIDEC_LIBS)
AC_SUBST(STB_HAL_INC)
AC_SUBST(STB_HAL_LIB)
AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS)
AC_OUTPUT([
Makefile

View File

@@ -105,7 +105,7 @@ neutrino_LDADD += -lgif
else
neutrino_LDADD += -lungif
endif
neutrino_LDADD += -llua -ldl
neutrino_LDADD += @LUA_LIBS@
if ENABLE_UPNP
neutrino_LDADD += \

View File

@@ -34,6 +34,7 @@ INCLUDES = \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libupnpclient \
@CURL_CFLAGS@ \
@LUA_CFLAGS@ \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL