From 57f4e4428a830c89436bf5025ca815a4e35776ac Mon Sep 17 00:00:00 2001
From: Alexander Traud <pabstraud@compuserve.com>
Date: Wed, 17 Aug 2016 13:12:19 +0200
Subject: [PATCH] BuildSystem: Detect ca_list_path capabilities in external
PJProject.
Since Asterisk 13.8, pj_ssl_cert_load_from_files2 got detected only in the
bundled PJProject but not in an external PJProject. Therefore, ca_list_path
could not be used in pjsip.conf. With this change, pj_ssl_cert_load_from_files2
is detected again to enable ca_list_path again.
ASTERISK-26303 #close
Change-Id: I4a4a0cdc5cdff33730911fb4cfc0498c069043d0
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 5ac2a1495b..43114a359a 100755
--- a/configure
+++ b/configure
@@ -25697,7 +25697,7 @@ if test "x${PBX_PJ_SSL_CERT_LOAD_FROM_FILES2}" != "x1" -a "${USE_PJ_SSL_CERT_LOA
pbxlibdir="-L${PJ_SSL_CERT_LOAD_FROM_FILES2_DIR}"
fi
fi
- pbxfuncname="pjsip/include/pjsip/sip_util.h"
+ pbxfuncname="pj_ssl_cert_load_from_files2"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes
else
diff --git a/configure.ac b/configure.ac
index 8ea1cb038d..ba13bf46d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2197,7 +2197,7 @@ if test "$USE_PJPROJECT" != "no" ; then
CPPFLAGS="${saved_cppflags}"
AST_EXT_LIB_CHECK([PJSIP_GET_DEST_INFO], [pjsip], [pjsip_get_dest_info], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
- AST_EXT_LIB_CHECK([PJ_SSL_CERT_LOAD_FROM_FILES2], [pj], [pjsip/include/pjsip/sip_util.h], [pjlib.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
+ AST_EXT_LIB_CHECK([PJ_SSL_CERT_LOAD_FROM_FILES2], [pj], [pj_ssl_cert_load_from_files2], [pjlib.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJSIP_EXTERNAL_RESOLVER], [pjsip], [pjsip_endpt_set_ext_resolver], [pjsip.h], [$PJPROJECT_LIBS], [$PJPROJECT_CFLAGS])
saved_cppflags="${CPPFLAGS}"
--
GitLab