lua: Ensure that the testsuite is being executed with the correct version

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 33502fbc66a9badb0714c4ddc533bffb7586ea0a..95e84e1d210a878a9e30b04a39300b0a2bcea68c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+       -e 's,@LUA_VERSION\@,$(LUA_VERSION),g' \
        -e 's,@VERSION\@,$(VERSION),g' \
        -e 's,@prefix\@,$(prefix),g' \
        -e 's,@exec_prefix\@,$(exec_prefix),g' \
@@ -281,7 +282,14 @@ LUA_TESTS = \
        tests/lua/main.lua
 
 EXTRA_DIST += \
-       $(LUA_TESTS)
+       tests/lua/main.lua.in
+
+CLEANFILES += \
+       tests/lua/main.lua
+
+tests/lua/main.lua: tests/lua/main.lua.in Makefile
+       $(SED_PROCESS)
+       chmod o+x $@
 
 # ------------------------------------------------------------------------------
 

diff --git a/configure.ac b/configure.ac
index 6ccadcf078a048c83a952658b5c18b48f66d22cb..af673a467a289be29d0e260a3939dc9247fbb5b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -217,11 +217,13 @@ AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
 AS_IF(
        [test "$enable_lua" = "yes"], [
                for lua in lua lua5.4 lua5.3 lua5.2 lua5.1; do
-                       PKG_CHECK_MODULES([LUA], [${lua}],[break], [true])
+                       PKG_CHECK_MODULES([LUA], [${lua}], [break], [true])
                done
 
                AX_PROG_LUA_MODULES([luaunit],, [AC_MSG_ERROR([Lua modules are missing])])
 
+               LUA_VERSION=$($PKG_CONFIG --variable=major_version ${lua})
+               AC_SUBST(LUA_VERSION)
                LUA_INSTALL_LMOD=$($PKG_CONFIG --define-variable=prefix=${prefix} --variable=INSTALL_LMOD ${lua})
                AC_SUBST(LUA_INSTALL_LMOD)
                LUA_INSTALL_CMOD=$($PKG_CONFIG --define-variable=prefix=${prefix} --variable=INSTALL_CMOD ${lua})

diff --git a/tests/lua/main.lua b/tests/lua/main.lua.in
similarity index 99%
rename from tests/lua/main.lua
rename to tests/lua/main.lua.in
index 45c795b415e376011aa2d899ee9ef6c5aa157e56..a9a96d5198f4d2ee2a1c568fa3e5cd115ea78d98 100755 (executable)
--- a/tests/lua/main.lua
+++ b/tests/lua/main.lua.in
@@ -1,4 +1,4 @@
-#!/usr/bin/lua
+#!/usr/bin/lua@LUA_VERSION@
 --[[###########################################################################
 #                                                                             #
 # libloc - A library to determine the location of someone on the Internet     #