From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 5 Jun 2025 15:19:03 +0000 (+0000)
Subject: lib-lua: Add missing lua scripts location
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ccdb8d8cbc476dbe9a62d42ff841c667fc475e7;p=thirdparty%2Fdovecot%2Fcore.git

lib-lua: Add missing lua scripts location

without this make check fails when the build dir is different than the source dir
---

diff --git a/src/lib-lua/Makefile.am b/src/lib-lua/Makefile.am
index 0e8a011ca9..f6c44e09a9 100644
--- a/src/lib-lua/Makefile.am
+++ b/src/lib-lua/Makefile.am
@@ -71,10 +71,10 @@ noinst_PROGRAMS = $(test_programs)
 test_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la
 
 test_lua_SOURCES = test-lua.c
-test_lua_CFLAGS = $(AM_CFLAGS) $(BINARY_CFLAGS)
-test_lua_LDFLAGS = $(BINARY_LDFLAGS)
 test_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
 test_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
+test_lua_CFLAGS = $(AM_CFLAGS) \
+	-DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 test_dict_lua_SOURCES = test-dict-lua.c
 test_dict_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
@@ -87,14 +87,14 @@ test_dns_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
 test_io_lua_SOURCES = test-io-lua.c
 test_io_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
 test_io_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
+test_io_lua_CFLAGS = $(AM_CFLAGS) \
+	-DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 test_lua_http_client_SOURCES = test-lua-http-client.c
 test_lua_http_client_LDADD = libdlua.la $(LIBDOVECOT) $(test_libs_ssl) $(LUA_LIBS)
 test_lua_http_client_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
-test_lua_http_client_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DOVECOT_BINARY_CFLAGS) \
-	-DTEST_LUA_SCRIPT_DIR=\"$(abs_top_srcdir)/src/lib-lua\"
+test_lua_http_client_CFLAGS = $(AM_CFLAGS) \
+	-DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 check-local:
 	for bin in $(test_programs); do \
diff --git a/src/lib-lua/test-io-lua.c b/src/lib-lua/test-io-lua.c
index 88580f7817..69be431769 100644
--- a/src/lib-lua/test-io-lua.c
+++ b/src/lib-lua/test-io-lua.c
@@ -36,7 +36,8 @@ static void test_io_lua(void)
 	struct dlua_script *script;
 	const char *error;
 
-	if (dlua_script_create_file("test-io-lua.lua", &script, NULL, &error) < 0)
+	if (dlua_script_create_file(TEST_LUA_SCRIPT_DIR "/test-io-lua.lua",
+				    &script, NULL, &error) < 0)
 		i_fatal("%s", error);
 
 	dlua_dovecot_register(script);
diff --git a/src/lib-lua/test-lua.c b/src/lib-lua/test-lua.c
index af350dc5b9..38d2c32791 100644
--- a/src/lib-lua/test-lua.c
+++ b/src/lib-lua/test-lua.c
@@ -523,7 +523,8 @@ static void test_lua_base64(void)
 	struct dlua_script *script;
 	const char *error;
 
-	if (dlua_script_create_file("test-lua-base64.lua", &script, NULL, &error) < 0)
+	if (dlua_script_create_file(TEST_LUA_SCRIPT_DIR "/test-lua-base64.lua",
+				    &script, NULL, &error) < 0)
 		i_fatal("%s", error);
 
 	dlua_dovecot_register(script);