From 423216915afc05f027f0471a984941d6b49e040f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 26 Sep 2024 14:52:38 +0000 Subject: [PATCH] lua: Ensure that the testsuite is being executed with the correct version Signed-off-by: Michael Tremer --- Makefile.am | 10 +++++++++- configure.ac | 4 +++- tests/lua/{main.lua => main.lua.in} | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) rename tests/lua/{main.lua => main.lua.in} (99%) diff --git a/Makefile.am b/Makefile.am index 33502fb..95e84e1 100644 --- 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 6ccadcf..af673a4 100644 --- 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 45c795b..a9a96d5 100755 --- 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 # -- 2.39.5