[Asterisk-code-review] pjproject bundled: Repair ./configure --with-ssl=PATH. (asterisk[15])

[George Joseph]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/9065 )

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

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
---
M configure
M third-party/pjproject/configure.m4
2 files changed, 34 insertions(+), 0 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/configure b/configure
index 9307014..bde00f8 100755
--- a/configure
+++ b/configure
@@ -9234,6 +9234,23 @@
 	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 9b70e09..ecdd138 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -54,6 +54,23 @@
 	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

-- 
To view, visit https://gerrit.asterisk.org/9065
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6
Gerrit-Change-Number: 9065
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180718/702a9104/attachment-0001.html>