From 966c7f13797ff3f466c3b2d55b98347a2ca83937 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 27 May 2013 13:36:50 +0200 Subject: [PATCH] configure: try to autodetect lualib --- configure.ac | 13 +++++++++++++ src/Makefile.am | 2 +- src/gui/Makefile.am | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fbd243680..9da436a10 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,17 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) 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(CONNECTION,tuxbox-connection) #TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver) @@ -202,6 +213,8 @@ AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) AC_SUBST(VORBISIDEC_CFLAGS) AC_SUBST(VORBISIDEC_LIBS) +AC_SUBST(LUA_CFLAGS) +AC_SUBST(LUA_LIBS) AC_OUTPUT([ Makefile diff --git a/src/Makefile.am b/src/Makefile.am index f80eed707..c3630c191 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,7 +122,7 @@ neutrino_LDADD += -lgif else neutrino_LDADD += -lungif endif -neutrino_LDADD += -llua -ldl +neutrino_LDADD += @LUA_LIBS@ if ENABLE_UPNP neutrino_LDADD += \ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index d0da43b10..6f13bfacb 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -28,6 +28,7 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/libupnpclient \ @CURL_CFLAGS@ \ + @LUA_CFLAGS@ \ @FREETYPE_CFLAGS@ if BOXTYPE_COOL