From ef79e583ec2d78ac251ef65bc46cd76a3ba3eab1 Mon Sep 17 00:00:00 2001 From: Alexander Traud <pabstraud@compuserve.com> Date: Mon, 5 Mar 2018 15:01:06 +0100 Subject: [PATCH] BuildSystem: Enable Lua in NetBSD. luaL_openlib got removed with Lua 5.2. luaL_newstate is available in all versions. ASTERISK-27718 Change-Id: I9c8c8880315ee36ab740d7c40153306c0bfd6f71 --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 18609ca20a..ead1b17776 100755 --- a/configure +++ b/configure @@ -29706,7 +29706,7 @@ if test "x${PBX_LUA}" = "x1" ; then fi fi -# Some distributions (like SuSE) remove the 5.1 suffix. +# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" @@ -29721,9 +29721,9 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_openlib in -llua" >&5 -$as_echo_n "checking for luaL_openlib in -llua... " >&6; } -if ${ac_cv_lib_lua_luaL_openlib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 +$as_echo_n "checking for luaL_newstate in -llua... " >&6; } +if ${ac_cv_lib_lua_luaL_newstate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29737,27 +29737,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char luaL_openlib (); +char luaL_newstate (); int main () { -return luaL_openlib (); +return luaL_newstate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_luaL_openlib=yes + ac_cv_lib_lua_luaL_newstate=yes else - ac_cv_lib_lua_luaL_openlib=no + ac_cv_lib_lua_luaL_newstate=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_openlib" >&5 -$as_echo "$ac_cv_lib_lua_luaL_openlib" >&6; } -if test "x$ac_cv_lib_lua_luaL_openlib" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no diff --git a/configure.ac b/configure.ac index a59646cfd9..a5e81d208a 100644 --- a/configure.ac +++ b/configure.ac @@ -2387,8 +2387,8 @@ if test "x${PBX_LUA}" = "x1" ; then fi fi -# Some distributions (like SuSE) remove the 5.1 suffix. -AST_EXT_LIB_CHECK([LUA], [lua], [luaL_openlib], [lua.h], [-lm]) +# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. +AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) # Accept either RADIUS client library, their APIs are fully compatible, # just different header filenames and different SONAMEs -- GitLab