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

configure: try to autodetect lualib

Browse Source
This commit is contained in:
Stefan Seyfried
2013-05-27 13:36:50 +02:00
committed by M. Liebmann
parent 53ed75f66d
commit 966c7f1379
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -94,6 +94,17 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
# 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(CONFIGFILE,tuxbox-configfile)
#TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection) #TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection)
#TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver) #TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver)
@@ -202,6 +213,8 @@ AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_LIBS)
AC_SUBST(VORBISIDEC_CFLAGS) AC_SUBST(VORBISIDEC_CFLAGS)
AC_SUBST(VORBISIDEC_LIBS) AC_SUBST(VORBISIDEC_LIBS)
AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile

2
src/Makefile.am
View File

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

1
src/gui/Makefile.am
View File

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