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

diff --git a/configure b/configure
index 66d1a52fe7d933ed007d2062fe612e2e2605c918..49b0ea83425cfd8a1ef8e16a2c1e9b43d3393b59 100755 (executable)
--- a/configure
+++ b/configure
@@ -9230,25 +9230,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 7cbb30781fa87234c484903af1939ab5cf49cbb1..485e4f1a742ba03c46e8677cd566273b7ab2499a 100644 (file)
--- 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