forked from Lainports/opnsense-ports
231 lines
7.3 KiB
Text
231 lines
7.3 KiB
Text
--- configure.orig 2014-08-17 22:31:23 UTC
|
|
+++ configure
|
|
@@ -632,6 +632,8 @@ CONFIG_GMIME
|
|
AIS_LIB
|
|
AIS_INCLUDE
|
|
PBX_AIS
|
|
+PBX_SSL_OP_NO_TLSV1_2
|
|
+PBX_SSL_OP_NO_TLSV1_1
|
|
OPENH323_BUILD
|
|
OPENH323_SUFFIX
|
|
OPENH323_LIBDIR
|
|
@@ -4698,9 +4700,9 @@ astetcdir='${sysconfdir}/asterisk'
|
|
astheaderdir='${includedir}/asterisk'
|
|
astlibdir='${libdir}/asterisk'
|
|
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'
|
|
@@ -4723,8 +4725,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
|
|
@@ -18470,6 +18470,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 ()
|
|
@@ -26245,7 +26247,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
|
|
@@ -26343,13 +26345,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. */
|
|
|
|
@@ -26391,18 +26393,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
|
|
@@ -26455,13 +26457,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. */
|
|
|
|
@@ -26503,18 +26505,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
|
|
@@ -27879,6 +27881,102 @@ $as_echo "no" >&6; }
|
|
|
|
fi
|
|
|
|
+if test "$PBX_OPENSSL" = "1";
|
|
+then
|
|
+
|
|
+ if test "x${PBX_SSL_OP_NO_TLSV1_1}" != "x1"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h" >&5
|
|
+$as_echo_n "checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h... " >&6; }
|
|
+ saved_cppflags="${CPPFLAGS}"
|
|
+ if test "x${SSL_OP_NO_TLSV1_1_DIR}" != "x"; then
|
|
+ SSL_OP_NO_TLSV1_1_INCLUDE="-I${SSL_OP_NO_TLSV1_1_DIR}/include"
|
|
+ fi
|
|
+ CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_1_INCLUDE}"
|
|
+
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+ #include <openssl/ssl.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+#if defined(SSL_OP_NO_TLSv1_1)
|
|
+ int foo = 0;
|
|
+ #else
|
|
+ int foo = bar;
|
|
+ #endif
|
|
+ 0
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ PBX_SSL_OP_NO_TLSV1_1=1
|
|
+
|
|
+$as_echo "#define HAVE_SSL_OP_NO_TLSV1_1 1" >>confdefs.h
|
|
+
|
|
+
|
|
+
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ CPPFLAGS="${saved_cppflags}"
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+ if test "x${PBX_SSL_OP_NO_TLSV1_2}" != "x1"; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h" >&5
|
|
+$as_echo_n "checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h... " >&6; }
|
|
+ saved_cppflags="${CPPFLAGS}"
|
|
+ if test "x${SSL_OP_NO_TLSV1_2_DIR}" != "x"; then
|
|
+ SSL_OP_NO_TLSV1_2_INCLUDE="-I${SSL_OP_NO_TLSV1_2_DIR}/include"
|
|
+ fi
|
|
+ CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_2_INCLUDE}"
|
|
+
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+ #include <openssl/ssl.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if defined(SSL_OP_NO_TLSv1_2)
|
|
+ int foo = 0;
|
|
+ #else
|
|
+ int foo = bar;
|
|
+ #endif
|
|
+ 0
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ PBX_SSL_OP_NO_TLSV1_2=1
|
|
+
|
|
+$as_echo "#define HAVE_SSL_OP_NO_TLSV1_2 1" >>confdefs.h
|
|
+
|
|
+
|
|
+
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ CPPFLAGS="${saved_cppflags}"
|
|
+ fi
|
|
+
|
|
+
|
|
+fi
|
|
+
|
|
|
|
if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then
|
|
pbxlibdir=""
|