mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 06:00:30 -04:00
d3728e419f
- Update net/asterisk13 to 13.5.0 - Add SQLITE2 option default description - Rename SQLITE option to SQLITE2, which better describes what it really does - Clean up Makefile and sort option helpers [1] - Add missed dependencies on openssl, ncurses and iconv [1] - Add back shabangfix for sample agi scripts - Make build log verbose [1] - Regenerated some patches Suggested by: koobs (thanks!) [1]
119 lines
4.8 KiB
Text
119 lines
4.8 KiB
Text
--- configure.orig 2015-07-24 22:06:05 UTC
|
|
+++ configure
|
|
@@ -4619,9 +4619,9 @@ astheaderdir='${includedir}/asterisk'
|
|
astlibdir='${libdir}'
|
|
astmoddir='${libdir}/asterisk/modules'
|
|
astmandir='${mandir}'
|
|
-astvarlibdir='${localstatedir}/lib/asterisk'
|
|
+astvarlibdir='${prefix}/share/asterisk'
|
|
astdatadir='${astvarlibdir}'
|
|
-astdbdir='${astvarlibdir}'
|
|
+astdbdir='${localstatedir}/db/asterisk'
|
|
astkeydir='${astvarlibdir}'
|
|
astspooldir='${localstatedir}/spool/asterisk'
|
|
astlogdir='${localstatedir}/log/asterisk'
|
|
@@ -4644,8 +4644,6 @@ esac
|
|
case "${host_os}" in
|
|
freebsd*)
|
|
ac_default_prefix=/usr/local
|
|
- CPPFLAGS=-I/usr/local/include
|
|
- LDFLAGS=-L/usr/local/lib
|
|
;;
|
|
openbsd*)
|
|
ac_default_prefix=/usr/local
|
|
@@ -18202,6 +18200,8 @@ $as_echo_n "checking if \"struct ifaddrs
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
+ #include <sys/types.h>
|
|
+ #include <sys/socket.h>
|
|
#include <ifaddrs.h>
|
|
int
|
|
main ()
|
|
@@ -26503,7 +26503,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
|
|
|
|
fi
|
|
|
|
- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
|
|
+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
|
|
|
|
if test "${HAS_OPENH323:-unset}" != "unset"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
|
|
@@ -26601,13 +26601,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
|
|
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
|
CFLAGS="${CFLAGS} "
|
|
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5
|
|
-$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5
|
|
+$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; }
|
|
if eval \${$as_ac_Lib+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS"
|
|
+LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -26649,18 +26649,18 @@ fi
|
|
|
|
# now check for the header.
|
|
if test "${AST_LUA_FOUND}" = "yes"; then
|
|
- LUA_LIB="${pbxlibdir} -llua5.2 -lm"
|
|
+ LUA_LIB="${pbxlibdir} -llua-5.2 -lm"
|
|
# if --with-LUA=DIR has been specified, use it.
|
|
if test "x${LUA_DIR}" != "x"; then
|
|
LUA_INCLUDE="-I${LUA_DIR}/include"
|
|
fi
|
|
LUA_INCLUDE="${LUA_INCLUDE} "
|
|
- if test "xlua5.2/lua.h" = "x" ; then # no header, assume found
|
|
+ if test "xlua52/lua.h" = "x" ; then # no header, assume found
|
|
LUA_HEADER_FOUND="1"
|
|
else # check for the header
|
|
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
|
|
LUA_HEADER_FOUND=1
|
|
else
|
|
@@ -26713,13 +26713,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
|
|
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
|
CFLAGS="${CFLAGS} "
|
|
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
|
|
-$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5
|
|
+$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; }
|
|
if eval \${$as_ac_Lib+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
|
|
+LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -26761,18 +26761,18 @@ fi
|
|
|
|
# now check for the header.
|
|
if test "${AST_LUA_FOUND}" = "yes"; then
|
|
- LUA_LIB="${pbxlibdir} -llua5.1 -lm"
|
|
+ LUA_LIB="${pbxlibdir} -llua-5.1 -lm"
|
|
# if --with-LUA=DIR has been specified, use it.
|
|
if test "x${LUA_DIR}" != "x"; then
|
|
LUA_INCLUDE="-I${LUA_DIR}/include"
|
|
fi
|
|
LUA_INCLUDE="${LUA_INCLUDE} "
|
|
- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found
|
|
+ if test "xlua51/lua.h" = "x" ; then # no header, assume found
|
|
LUA_HEADER_FOUND="1"
|
|
else # check for the header
|
|
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
|
|
+ ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :
|
|
LUA_HEADER_FOUND=1
|
|
else
|