Browse Source

[Minor] Set lua cpath to RSPAMD_LIBDIR, not LUALIBDIR

tags/1.7.0
Vsevolod Stakhov 7 years ago
parent
commit
626d567fec
2 changed files with 14 additions and 2 deletions
  1. 1
    0
      config.h.in
  2. 13
    2
      src/lua/lua_common.c

+ 1
- 0
config.h.in View File

@@ -193,6 +193,7 @@
#define RSPAMD_RULESDIR "${RULESDIR}"
#define RSPAMD_WWWDIR "${WWWDIR}"
#define RSPAMD_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define RSPAMD_LIBDIR "${RSPAMD_LIBDIR}"

#define RSPAMD_VERSION_MAJOR "${RSPAMD_VERSION_MAJOR}"
#define RSPAMD_VERSION_MINOR "${RSPAMD_VERSION_MINOR}"

+ 13
- 2
src/lua/lua_common.c View File

@@ -208,7 +208,8 @@ rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg, GHashTable *vars)
const ucl_object_t *opts;
const gchar *pluginsdir = RSPAMD_PLUGINSDIR,
*rulesdir = RSPAMD_RULESDIR,
*lualibdir = RSPAMD_LUALIBDIR;
*lualibdir = RSPAMD_LUALIBDIR,
*libdir = RSPAMD_LIBDIR;

gchar path_buf[PATH_MAX];

@@ -249,6 +250,16 @@ rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg, GHashTable *vars)
if (t) {
lualibdir = t;
}

t = g_hash_table_lookup (vars, "LIBDIR");
if (t) {
libdir = t;
}

t = g_hash_table_lookup (vars, "RSPAMD_LIBDIR");
if (t) {
libdir = t;
}
}

if (additional_path) {
@@ -288,7 +299,7 @@ rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg, GHashTable *vars)
rspamd_snprintf (path_buf, sizeof (path_buf),
"%s/?.so;"
"%s",
lualibdir,
libdir,
old_path);
lua_pop (L, 1);
lua_pushstring (L, path_buf);

Loading…
Cancel
Save