From 77837059ac4c8c86a2e55ae4231a089dee1581a5 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sun, 3 May 2020 12:30:15 +0200
Subject: [PATCH] pjproject: Remove bashism from configure.m4 script

The configure.m4 script for pjproject contains some += syntax, which
is specific to bash, replacing it with string substitutions makes
the script compatible with traditional Bourne shells.

ASTERISK-28866 #close
Reported-by: Christoph Moench-Tegeder <cmt@FreeBSD.org>

Change-Id: I382a78160e028044598b7da83ec7e1ff42b91c05
---
 configure                          | 10 +++++-----
 third-party/pjproject/configure.m4 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 072c09ed2a..ee546e03c7 100755
--- a/configure
+++ b/configure
@@ -9207,25 +9207,25 @@ $as_echo "configuring" >&6; }
 
 		this_host=$(./config.sub $(./config.guess))
 		if test "$build" != "$this_host" ; then
-			PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"
 		fi
 		if test "$host" != "$this_host" ; then
-			PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"
 		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"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"
 			;;
 			y|ye|yes)
 			# Not to mention SSL is the default in PJProject and means "autodetect".
 			# In Asterisk, "./configure --with-ssl" means "must be present".
-			PJPROJECT_CONFIGURE_OPTS+=""
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"
 			;;
 			*)
-			PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
 			;;
 			esac
 		fi
diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index 7cbb30781f..485e4f1a74 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -51,25 +51,25 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
 		AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])
 		this_host=$(./config.sub $(./config.guess))
 		if test "$build" != "$this_host" ; then
-			PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"
 		fi
 		if test "$host" != "$this_host" ; then
-			PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"
 		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"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"
 			;;
 			y|ye|yes)
 			# Not to mention SSL is the default in PJProject and means "autodetect".
 			# In Asterisk, "./configure --with-ssl" means "must be present".
-			PJPROJECT_CONFIGURE_OPTS+=""
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"
 			;;
 			*)
-			PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
+			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
 			;;
 			esac
 		fi