<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15284">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, approved
Joshua Colp: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pbx_lua: Add LUA_VERSIONS environment variable to ./configure.<br><br>On Gentoo it's possible to have multiple lua versions installed, all<br>with a path of /usr, so it's not possible to use the current --with-lua<br>option to determisticly pin to a specific version as is required by the<br>Gentoo PMS standards.<br><br>This environment variable allows to lock to specific versions,<br>unversioned check will be skipped if this variable is supplied.<br><br>Change-Id: I8c403eda05df25ee0193960262ce849c7d2fd088<br>Signed-off-by: Jaco Kroon <jaco@uls.co.za><br>---<br>M configure<br>M configure.ac<br>2 files changed, 12 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 98fb6cd..ec7d155 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -1051,6 +1051,7 @@</span><br><span> MISDN_DIR</span><br><span> MISDN_INCLUDE</span><br><span> MISDN_LIB</span><br><span style="color: hsl(120, 100%, 40%);">+LUA_VERSIONS</span><br><span> PBX_LUA</span><br><span> LUA_DIR</span><br><span> LUA_INCLUDE</span><br><span>@@ -1477,6 +1478,7 @@</span><br><span> CXXCPP</span><br><span> JANSSON_CONFIGURE_OPTS</span><br><span> PJPROJECT_CONFIGURE_OPTS</span><br><span style="color: hsl(120, 100%, 40%);">+LUA_VERSIONS</span><br><span> PKG_CONFIG</span><br><span> PKG_CONFIG_PATH</span><br><span> PKG_CONFIG_LIBDIR</span><br><span>@@ -2235,6 +2237,8 @@</span><br><span> Additional configure options to pass to bundled jansson</span><br><span> PJPROJECT_CONFIGURE_OPTS</span><br><span> Additional configure options to pass to bundled pjproject</span><br><span style="color: hsl(120, 100%, 40%);">+ LUA_VERSIONS</span><br><span style="color: hsl(120, 100%, 40%);">+ A space separated list of target lua versions to test.</span><br><span> PKG_CONFIG path to pkg-config utility</span><br><span> PKG_CONFIG_PATH</span><br><span> directories to add to pkg-config's search path</span><br><span>@@ -29633,7 +29637,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-for ver in 5.4 5.3 5.2 5.1; do</span><br><span style="color: hsl(120, 100%, 40%);">+for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do</span><br><span> </span><br><span> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span>@@ -29744,6 +29748,7 @@</span><br><span> done</span><br><span> </span><br><span> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${LUA_VERSIONS}" = "x"; then</span><br><span> </span><br><span> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span>@@ -29840,6 +29845,7 @@</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> # Accept either RADIUS client library, their APIs are fully compatible,</span><br><span> # just different header filenames and different SONAMEs</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index e842a0c..c34638a 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -511,6 +511,7 @@</span><br><span> AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt])</span><br><span> AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt])</span><br><span> AST_EXT_LIB_SETUP([LUA], [Lua], [lua])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_VAR([LUA_VERSIONS],[A space separated list of target lua versions to test.])</span><br><span> AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn])</span><br><span> AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient])</span><br><span> AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])</span><br><span>@@ -2559,7 +2560,7 @@</span><br><span> fi</span><br><span> AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-for ver in 5.4 5.3 5.2 5.1; do</span><br><span style="color: hsl(120, 100%, 40%);">+for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do</span><br><span> AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])</span><br><span> if test "x${PBX_LUA}" = "x1" ; then</span><br><span> if test x"${LUA_DIR}" = x; then</span><br><span>@@ -2572,7 +2573,9 @@</span><br><span> done</span><br><span> </span><br><span> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${LUA_VERSIONS}" = "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> # Accept either RADIUS client library, their APIs are fully compatible,</span><br><span> # just different header filenames and different SONAMEs</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15284">change 15284</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15284"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I8c403eda05df25ee0193960262ce849c7d2fd088 </div>
<div style="display:none"> Gerrit-Change-Number: 15284 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>