kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 23:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjproject_bundled: Repair ./configure --with-ssl=PATH.

Browse Source 
Previously, Asterisk did not tell its bundled PJProject about this configure
parameter. Therefore, PJProject used the platform provided OpenSSL always.

ASTERISK-27880

Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6
This commit is contained in:
Alexander Traud
2018-05-29 16:31:53 +02:00
committed by George Joseph
parent 5f01f73f51
commit fe78d374b0
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@@ -9213,6 +9213,23 @@ $as_echo "configuring" >&6; }
if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
fi
# This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same.
if test "${with_ssl+set}" = set; then :
case $with_ssl in
n|no)
PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
;;
y|ye|yes)
# This is the default value in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
;;
*)
PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
;;
esac
fi
export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
export NOISY_BUILD

17
third-party/pjproject/configure.m4 vendored
View File

@@ -54,6 +54,23 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
fi
# This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same.
if test "${with_ssl+set}" = set; then :
case $with_ssl in
n|no)
PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
;;
y|ye|yes)
# This is the default value in PJProject and means "autodetect".
# In Asterisk, "./configure --with-ssl" means "must be present".
PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
;;
*)
PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
;;
esac
fi
export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
export NOISY_BUILD