--- configure.orig	2020-07-09 15:33:47 UTC
+++ configure
@@ -4667,8 +4667,6 @@ case "${host_os}" in
      ;;
      dragonfly*|freebsd*)
      ac_default_prefix=/usr/local
-     CPPFLAGS=-I/usr/local/include
-     LDFLAGS=-L/usr/local/lib
      ;;
      openbsd*)
      ac_default_prefix=/usr/local
@@ -20570,6 +20568,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/socket.h>
  #include <ifaddrs.h>
 int
 main ()
@@ -29285,6 +29285,8 @@ fi
 
 for ver in 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.
@@ -29300,12 +29302,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
       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; }
+$as_echo_n "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.  */
 
@@ -29347,7 +29349,7 @@ fi
 
    # 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"
@@ -29358,7 +29360,7 @@ fi
          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"
+ac_fn_c_check_header_mongrel "$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
@@ -29385,9 +29387,9 @@ fi
 
 	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