[vlc-devel] [PATCH] Distribute .lua files if we can't use luac

Rafaël Carré funman at videolan.org
Fri Feb 10 12:22:10 CET 2012


---
 configure.ac      |    1 +
 share/Makefile.am |  109 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/configure.ac b/configure.ac
index f8f4bbd..94eafb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1601,6 +1601,7 @@ then
   ])
 fi
 AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
+AM_CONDITIONAL(BUILD_LUAC, [test "${LUAC}" != "false"])
 
 
 dnl
diff --git a/share/Makefile.am b/share/Makefile.am
index f062f02..315b0fc 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -148,61 +148,68 @@ luac_verbose_0 = @echo "  LUAC   $@";
 	$(luac_verbose)$(LUAC) -o $@ $<
 
 if BUILD_LUA
+
+if BUILD_LUAC
+LUA_EXT=lua
+else
+LUA_EXT=luac
+endif
+
 nobase_vlclib_DATA = \
-	lua/intf/cli.luac \
-	lua/intf/dummy.luac \
-	lua/intf/dumpmeta.luac \
-	lua/intf/hotkeys.luac \
-	lua/intf/luac.luac \
-	lua/intf/modules/common.luac \
-	lua/intf/modules/host.luac \
-	lua/intf/telnet.luac \
-	lua/meta/art/02_frenchtv.luac \
-	lua/meta/art/03_lastfm.luac \
-	lua/meta/art/01_googleimage.luac \
-	lua/meta/art/00_musicbrainz.luac \
-	lua/meta/fetcher/tvrage.luac \
-	lua/meta/reader/filename.luac \
-	lua/modules/dkjson.luac \
-	lua/modules/sandbox.luac \
-	lua/modules/simplexml.luac \
-	lua/playlist/anevia_streams.luac \
-	lua/playlist/anevia_xml.luac \
-	lua/playlist/appletrailers.luac \
-	lua/playlist/bbc_co_uk.luac \
-	lua/playlist/break.luac \
-	lua/playlist/canalplus.luac \
-	lua/playlist/cue.luac \
-	lua/playlist/dailymotion.luac \
-	lua/playlist/extreme.luac \
-	lua/playlist/france2.luac \
-	lua/playlist/googlevideo.luac \
-	lua/playlist/jamendo.luac \
-	lua/playlist/joox.luac \
-	lua/playlist/katsomo.luac \
-	lua/playlist/koreus.luac \
-	lua/playlist/lelombrik.luac \
-	lua/playlist/megavideo.luac \
-	lua/playlist/metacafe.luac \
-	lua/playlist/metachannels.luac \
-	lua/playlist/mpora.luac \
-	lua/playlist/pinkbike.luac \
-	lua/playlist/pluzz.luac \
-	lua/playlist/rockbox_fm_presets.luac \
-	lua/playlist/vimeo.luac \
-	lua/playlist/youtube.luac \
-	lua/playlist/youtube_homepage.luac \
-	lua/playlist/zapiks.luac \
-	lua/sd/fmc.luac \
-	lua/sd/freebox.luac \
-	lua/sd/icecast.luac \
-	lua/sd/jamendo.luac \
-	lua/sd/metachannels.luac \
+	lua/intf/cli.$(LUA_EXT) \
+	lua/intf/dummy.$(LUA_EXT) \
+	lua/intf/dumpmeta.$(LUA_EXT) \
+	lua/intf/hotkeys.$(LUA_EXT) \
+	lua/intf/luac.$(LUA_EXT) \
+	lua/intf/modules/common.$(LUA_EXT) \
+	lua/intf/modules/host.$(LUA_EXT) \
+	lua/intf/telnet.$(LUA_EXT) \
+	lua/meta/art/02_frenchtv.$(LUA_EXT) \
+	lua/meta/art/03_lastfm.$(LUA_EXT) \
+	lua/meta/art/01_googleimage.$(LUA_EXT) \
+	lua/meta/art/00_musicbrainz.$(LUA_EXT) \
+	lua/meta/fetcher/tvrage.$(LUA_EXT) \
+	lua/meta/reader/filename.$(LUA_EXT) \
+	lua/modules/dkjson.$(LUA_EXT) \
+	lua/modules/sandbox.$(LUA_EXT) \
+	lua/modules/simplexml.$(LUA_EXT) \
+	lua/playlist/anevia_streams.$(LUA_EXT) \
+	lua/playlist/anevia_xml.$(LUA_EXT) \
+	lua/playlist/appletrailers.$(LUA_EXT) \
+	lua/playlist/bbc_co_uk.$(LUA_EXT) \
+	lua/playlist/break.$(LUA_EXT) \
+	lua/playlist/canalplus.$(LUA_EXT) \
+	lua/playlist/cue.$(LUA_EXT) \
+	lua/playlist/dailymotion.$(LUA_EXT) \
+	lua/playlist/extreme.$(LUA_EXT) \
+	lua/playlist/france2.$(LUA_EXT) \
+	lua/playlist/googlevideo.$(LUA_EXT) \
+	lua/playlist/jamendo.$(LUA_EXT) \
+	lua/playlist/joox.$(LUA_EXT) \
+	lua/playlist/katsomo.$(LUA_EXT) \
+	lua/playlist/koreus.$(LUA_EXT) \
+	lua/playlist/lelombrik.$(LUA_EXT) \
+	lua/playlist/megavideo.$(LUA_EXT) \
+	lua/playlist/metacafe.$(LUA_EXT) \
+	lua/playlist/metachannels.$(LUA_EXT) \
+	lua/playlist/mpora.$(LUA_EXT) \
+	lua/playlist/pinkbike.$(LUA_EXT) \
+	lua/playlist/pluzz.$(LUA_EXT) \
+	lua/playlist/rockbox_fm_presets.$(LUA_EXT) \
+	lua/playlist/vimeo.$(LUA_EXT) \
+	lua/playlist/youtube.$(LUA_EXT) \
+	lua/playlist/youtube_homepage.$(LUA_EXT) \
+	lua/playlist/zapiks.$(LUA_EXT) \
+	lua/sd/fmc.$(LUA_EXT) \
+	lua/sd/freebox.$(LUA_EXT) \
+	lua/sd/icecast.$(LUA_EXT) \
+	lua/sd/jamendo.$(LUA_EXT) \
+	lua/sd/metachannels.$(LUA_EXT) \
 	$(NULL)
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
-	lua/intf/http.luac \
-	lua/intf/modules/httprequests.luac \
+	lua/intf/http.$(LUA_EXT) \
+	lua/intf/modules/httprequests.$(LUA_EXT) \
 	$(NULL)
 nobase_vlcdata_DATA += $(DIST_http_lua)
 endif
-- 
1.7.9



More information about the vlc-devel mailing list