--- configure.orig 2023-03-09 21:54:03 UTC +++ configure @@ -4790,8 +4790,6 @@ ;; dragonfly*|freebsd*) ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; openbsd*) ac_default_prefix=/usr/local @@ -19579,8 +19577,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -$as_echo "#define HAVE_SYSINFO 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -21196,6 +21192,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include + #include #include int main () @@ -30633,6 +30631,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do +vernodot=`echo ${ver} | sed 's/\.//'` + if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. @@ -30647,13 +30647,13 @@ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 -$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5 +printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; } if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS" +LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30695,7 +30695,7 @@ # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua${ver} -lm" + LUA_LIB="${pbxlibdir} -llua-${ver} -lm" # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" @@ -30705,8 +30705,8 @@ # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" + as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : LUA_HEADER_FOUND=1 else @@ -30733,9 +30733,9 @@ if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then - LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${vernodot}" else - LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${vernodot}" fi break; fi