kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjproject: Remove bashism from configure.m4 script

Browse Source 
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
This commit is contained in:
Guido Falsi
2020-05-03 12:30:15 +02:00
committed by Guido Falsi
parent 5d508a4cc3
commit 28b966535a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -9238,25 +9238,25 @@ $as_echo "configuring" >&6; }
this_host=$(./config.sub $(./config.guess)) this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then if test "$build" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"
fi fi
if test "$host" != "$this_host" ; then if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"
fi fi
# This was a copy of the autoconf generated code from the root ./configure. # This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same. # Hopefully, when you read this, the code is still the same.
if test "${with_ssl+set}" = set; then : if test "${with_ssl+set}" = set; then :
case $with_ssl in case $with_ssl in
n|no) n|no)
PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"
;; ;;
y|ye|yes) y|ye|yes)
# Not to mention SSL is the default 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". # 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 esac
fi fi

10
third-party/pjproject/configure.m4 vendored
View File

@@ -51,25 +51,25 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject]) AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])
this_host=$(./config.sub $(./config.guess)) this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then if test "$build" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"
fi fi
if test "$host" != "$this_host" ; then if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"
fi fi
# This was a copy of the autoconf generated code from the root ./configure. # This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same. # Hopefully, when you read this, the code is still the same.
if test "${with_ssl+set}" = set; then : if test "${with_ssl+set}" = set; then :
case $with_ssl in case $with_ssl in
n|no) n|no)
PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl" PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"
;; ;;
y|ye|yes) y|ye|yes)
# Not to mention SSL is the default 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". # 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 esac
fi fi