[Asterisk-code-review] pjproject_bundled: Repair ./configure --with-ssl without ARG. (asterisk[master])

Friendly Automation asteriskteam at digium.com
Mon Apr 13 18:22:36 CDT 2020


Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/14147 )

Change subject: pjproject_bundled: Repair ./configure --with-ssl without ARG.
......................................................................

pjproject_bundled: Repair ./configure --with-ssl without ARG.

ASTERISK-28758
Reported by: Patrick Wakano
Reported by: Dmitriy Serov

Change-Id: Ifb6b85c559d116739af00bc48d1f547caa85efac
---
M configure
M third-party/pjproject/configure.m4
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  George Joseph: Looks good to me, but someone else must approve
  Friendly Automation: Approved for Submit



diff --git a/configure b/configure
index 654bc06..aba5221 100755
--- a/configure
+++ b/configure
@@ -9249,9 +9249,9 @@
 		PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
 		;;
 		y|ye|yes)
-		# This is the default value in PJProject and means "autodetect".
+		# Not to mention SSL is the default in PJProject and means "autodetect".
 		# In Asterisk, "./configure --with-ssl" means "must be present".
-		PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
+		PJPROJECT_CONFIGURE_OPTS+=""
 		;;
 		*)
 		PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index edf76ba..7621232 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -62,9 +62,9 @@
 		PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
 		;;
 		y|ye|yes)
-		# This is the default value in PJProject and means "autodetect".
+		# Not to mention SSL is the default in PJProject and means "autodetect".
 		# In Asterisk, "./configure --with-ssl" means "must be present".
-		PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"
+		PJPROJECT_CONFIGURE_OPTS+=""
 		;;
 		*)
 		PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"

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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ifb6b85c559d116739af00bc48d1f547caa85efac
Gerrit-Change-Number: 14147
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200413/b00851e9/attachment.html>


More information about the asterisk-code-review mailing list