From fe78d374b0493c82a4ea9e171ecf04e6d57e47bf Mon Sep 17 00:00:00 2001
From: Alexander Traud <pabstraud@compuserve.com>
Date: Tue, 29 May 2018 16:31:53 +0200
Subject: [PATCH] pjproject_bundled: Repair ./configure --with-ssl=PATH.
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
---
configure | 17 +++++++++++++++++
third-party/pjproject/configure.m4 | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/configure b/configure
index 984f53b70d..088a1420e9 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index 9b70e09ff6..ecdd138612 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -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
--
GitLab