kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx_lua: Add LUA_VERSIONS environment variable to ./configure.

Browse Source 
On Gentoo it's possible to have multiple lua versions installed, all
with a path of /usr, so it's not possible to use the current --with-lua
option to determisticly pin to a specific version as is required by the
Gentoo PMS standards.

This environment variable allows to lock to specific versions,
unversioned check will be skipped if this variable is supplied.

Change-Id: I8c403eda05df25ee0193960262ce849c7d2fd088
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
This commit is contained in:
Jaco Kroon
2020-12-23 19:41:10 +02:00
committed by Joshua Colp
parent 3bcf483373
commit 4e038c1eaa
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -1051,6 +1051,7 @@ PBX_MISDN
MISDN_DIR MISDN_DIR
MISDN_INCLUDE MISDN_INCLUDE
MISDN_LIB MISDN_LIB
LUA_VERSIONS
PBX_LUA PBX_LUA
LUA_DIR LUA_DIR
LUA_INCLUDE LUA_INCLUDE
@@ -1477,6 +1478,7 @@ CCC
CXXCPP CXXCPP
JANSSON_CONFIGURE_OPTS JANSSON_CONFIGURE_OPTS
PJPROJECT_CONFIGURE_OPTS PJPROJECT_CONFIGURE_OPTS
LUA_VERSIONS
PKG_CONFIG PKG_CONFIG
PKG_CONFIG_PATH PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR
@@ -2235,6 +2237,8 @@ Some influential environment variables:
Additional configure options to pass to bundled jansson Additional configure options to pass to bundled jansson
PJPROJECT_CONFIGURE_OPTS PJPROJECT_CONFIGURE_OPTS
Additional configure options to pass to bundled pjproject Additional configure options to pass to bundled pjproject
LUA_VERSIONS
A space separated list of target lua versions to test.
PKG_CONFIG path to pkg-config utility PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH PKG_CONFIG_PATH
directories to add to pkg-config's search path directories to add to pkg-config's search path
@@ -29633,7 +29637,7 @@ fi
for ver in 5.4 5.3 5.2 5.1; do for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -29744,6 +29748,7 @@ fi
done done
# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.
if test "x${LUA_VERSIONS}" = "x"; then
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -29840,6 +29845,7 @@ _ACEOF
fi fi
fi
# Accept either RADIUS client library, their APIs are fully compatible, # Accept either RADIUS client library, their APIs are fully compatible,
# just different header filenames and different SONAMEs # just different header filenames and different SONAMEs

7
configure.ac
View File

@@ -511,6 +511,7 @@ AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt]) AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt])
AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt]) AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AC_ARG_VAR([LUA_VERSIONS],[A space separated list of target lua versions to test.])
AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn]) AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn])
AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient]) AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient])
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs]) AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
@@ -2559,7 +2560,7 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
fi fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
for ver in 5.4 5.3 5.2 5.1; do for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm]) AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
if test "x${PBX_LUA}" = "x1" ; then if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then if test x"${LUA_DIR}" = x; then
@@ -2572,7 +2573,9 @@ for ver in 5.4 5.3 5.2 5.1; do
done done
# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.
AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) if test "x${LUA_VERSIONS}" = "x"; then
AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])
fi
# Accept either RADIUS client library, their APIs are fully compatible, # Accept either RADIUS client library, their APIs are fully compatible,
# just different header filenames and different SONAMEs # just different header filenames and different SONAMEs