summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-03-12 09:13:51 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-03-12 09:13:51 -0500
commit0d0738aaaf133f524addde9c01735c1aa2312ebb (patch)
tree666fe54351b4ba8f997e7cc9711886c7e767db9e
parentffdd4b1c39a304a2bb0faf4ce10d5b1d07ac19c8 (diff)
parentef79e583ec2d78ac251ef65bc46cd76a3ba3eab1 (diff)
Merge "BuildSystem: Enable Lua in NetBSD."
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac4
2 files changed, 13 insertions, 13 deletions
diff --git a/configure b/configure
index 18609ca20..ead1b1777 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 a59646cfd..a5e81d208 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