<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14218">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, approved
Benjamin Keith Ford: Looks good to me, but someone else must approve
George Joseph: Looks good to me, but someone else must approve
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject_bundled: Honor --without-pjproject.<br><br>ASTERISK-28837<br><br>Change-Id: Id057324912a3cfe6f50af372675626bb515907d9<br>---<br>M configure<br>M menuselect/configure<br>M third-party/pjproject/configure.m4<br>3 files changed, 225 insertions(+), 215 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 6136b75..66d1a52 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -9186,91 +9186,93 @@</span><br><span> as_fn_error $? "--with-pjproject and --with-pjproject-bundled can't both be specified" "$LINENO" 5</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ac_mandatory_list="$ac_mandatory_list PJPROJECT"</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_pjproject}" != "no" && test "${with_pjproject}" != "n" ; then</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded pjproject (may have to download)" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_mandatory_list="$ac_mandatory_list PJPROJECT"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded pjproject (may have to download)" >&5</span><br><span> $as_echo_n "checking for embedded pjproject (may have to download)... " >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring" >&5</span><br><span> $as_echo "configuring" >&6; }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${BZIP2}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "bzip2 is required to extract the pjproject tar file" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${TAR}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "tar is required to extract the pjproject tar file" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${PATCH}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "patch is required to configure bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${SED}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "sed is required to configure bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${NM}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "nm is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${MD5}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "md5sum is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${CAT}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "cat is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${CUT}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "cut is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${GREP}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "grep is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${BZIP2}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "bzip2 is required to extract the pjproject tar file" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${TAR}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "tar is required to extract the pjproject tar file" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${PATCH}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "patch is required to configure bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${SED}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "sed is required to configure bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${NM}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "nm is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${MD5}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "md5sum is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${CAT}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "cat is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${CUT}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "cut is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${GREP}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "grep is required to build bundled pjproject" "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- this_host=$(./config.sub $(./config.guess))</span><br><span style="color: hsl(0, 100%, 40%);">- if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(0, 100%, 40%);">- # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(0, 100%, 40%);">- case $with_ssl in</span><br><span style="color: hsl(0, 100%, 40%);">- n|no)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- y|ye|yes)</span><br><span style="color: hsl(0, 100%, 40%);">- # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span style="color: hsl(0, 100%, 40%);">- # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- esac</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+ this_host=$(./config.sub $(./config.guess))</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ case $with_ssl in</span><br><span style="color: hsl(120, 100%, 40%);">+ n|no)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span style="color: hsl(120, 100%, 40%);">+ # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(0, 100%, 40%);">- export NOISY_BUILD AST_DEVMODE</span><br><span style="color: hsl(0, 100%, 40%);">- ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span style="color: hsl(0, 100%, 40%);">- EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span style="color: hsl(0, 100%, 40%);">- configure</span><br><span style="color: hsl(0, 100%, 40%);">- if test $? -ne 0 ; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(120, 100%, 40%);">+ export NOISY_BUILD AST_DEVMODE</span><br><span style="color: hsl(120, 100%, 40%);">+ ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span style="color: hsl(120, 100%, 40%);">+ configure</span><br><span style="color: hsl(120, 100%, 40%);">+ if test $? -ne 0 ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5</span><br><span> $as_echo "failed" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: Unable to configure ${PJPROJECT_DIR}" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: Unable to configure ${PJPROJECT_DIR}" >&5</span><br><span> $as_echo "$as_me: Unable to configure ${PJPROJECT_DIR}" >&6;}</span><br><span style="color: hsl(0, 100%, 40%);">- as_fn_error $? "Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details." "$LINENO" 5</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+ as_fn_error $? "Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details." "$LINENO" 5</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bundled pjproject" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bundled pjproject" >&5</span><br><span> $as_echo_n "checking for bundled pjproject... " >&6; }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" echo_cflags)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"</span><br><span style="color: hsl(0, 100%, 40%);">- PBX_PJPROJECT=1</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" echo_cflags)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_PJPROJECT=1</span><br><span> </span><br><span> </span><br><span> $as_echo "#define HAVE_PJPROJECT 1" >>confdefs.h</span><br><span>@@ -9327,11 +9329,13 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5</span><br><span> $as_echo "yes" >&6; }</span><br><span> </span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> </span><br><span> # AST_EXT_LIB_SETUP is used to tell configure to handle variables for</span><br><span>@@ -13434,8 +13438,8 @@</span><br><span> if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for libedit... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for LIBEDIT... " >&6; }</span><br><span> </span><br><span> if test -n "$LIBEDIT_CFLAGS"; then</span><br><span> pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"</span><br><span>@@ -13475,7 +13479,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -13496,7 +13500,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_LIBEDIT=0</span><br><span>@@ -13894,8 +13898,8 @@</span><br><span> if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for jansson >= 2.11... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for JANSSON... " >&6; }</span><br><span> </span><br><span> if test -n "$JANSSON_CFLAGS"; then</span><br><span> pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"</span><br><span>@@ -13935,7 +13939,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -13956,7 +13960,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_JANSSON=0</span><br><span>@@ -20582,8 +20586,8 @@</span><br><span> if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libilbc" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for libilbc... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ILBC" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for ILBC... " >&6; }</span><br><span> </span><br><span> if test -n "$ILBC_CFLAGS"; then</span><br><span> pkg_cv_ILBC_CFLAGS="$ILBC_CFLAGS"</span><br><span>@@ -20623,7 +20627,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -20644,7 +20648,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_ILBC=0</span><br><span>@@ -24823,8 +24827,8 @@</span><br><span> if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for libpjproject... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PJPROJECT" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for PJPROJECT... " >&6; }</span><br><span> </span><br><span> if test -n "$PJPROJECT_CFLAGS"; then</span><br><span> pkg_cv_PJPROJECT_CFLAGS="$PJPROJECT_CFLAGS"</span><br><span>@@ -24864,7 +24868,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -24885,7 +24889,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PJPROJECT=0</span><br><span>@@ -26172,8 +26176,8 @@</span><br><span> if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for python... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for PYTHONDEV... " >&6; }</span><br><span> </span><br><span> if test -n "$PYTHONDEV_CFLAGS"; then</span><br><span> pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"</span><br><span>@@ -26213,7 +26217,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -26234,7 +26238,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PYTHONDEV=0</span><br><span>@@ -26368,8 +26372,8 @@</span><br><span> if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for portaudio-2.0... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for PORTAUDIO... " >&6; }</span><br><span> </span><br><span> if test -n "$PORTAUDIO_CFLAGS"; then</span><br><span> pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"</span><br><span>@@ -26409,7 +26413,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -26430,7 +26434,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PORTAUDIO=0</span><br><span>@@ -32670,8 +32674,8 @@</span><br><span> if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for gmime-$ver... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMIME" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for GMIME... " >&6; }</span><br><span> </span><br><span> if test -n "$GMIME_CFLAGS"; then</span><br><span> pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"</span><br><span>@@ -32711,7 +32715,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -32732,7 +32736,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GMIME=0</span><br><span>@@ -34107,8 +34111,8 @@</span><br><span> if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for gtk+-2.0... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for GTK2... " >&6; }</span><br><span> </span><br><span> if test -n "$GTK2_CFLAGS"; then</span><br><span> pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"</span><br><span>@@ -34148,7 +34152,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -34169,7 +34173,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GTK2=0</span><br><span>@@ -34218,8 +34222,8 @@</span><br><span> if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for libsystemd... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for SYSTEMD... " >&6; }</span><br><span> </span><br><span> if test -n "$SYSTEMD_CFLAGS"; then</span><br><span> pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"</span><br><span>@@ -34259,7 +34263,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -34280,7 +34284,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_SYSTEMD=0</span><br><span>diff --git a/menuselect/configure b/menuselect/configure</span><br><span>index df7b81e..1d15c1c 100755</span><br><span>--- a/menuselect/configure</span><br><span>+++ b/menuselect/configure</span><br><span>@@ -4982,8 +4982,8 @@</span><br><span> if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for gtk+-2.0... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for GTK2... " >&6; }</span><br><span> </span><br><span> if test -n "$GTK2_CFLAGS"; then</span><br><span> pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"</span><br><span>@@ -5023,7 +5023,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -5044,7 +5044,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GTK2=0</span><br><span>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4</span><br><span>index 81a6559..7cbb307 100644</span><br><span>--- a/third-party/pjproject/configure.m4</span><br><span>+++ b/third-party/pjproject/configure.m4</span><br><span>@@ -9,111 +9,117 @@</span><br><span> AC_MSG_ERROR(--with-pjproject and --with-pjproject-bundled can't both be specified)</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ac_mandatory_list="$ac_mandatory_list PJPROJECT"</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_pjproject}" != "no" && test "${with_pjproject}" != "n" ; then</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_CHECKING(for embedded pjproject (may have to download))</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_RESULT(configuring)</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_mandatory_list="$ac_mandatory_list PJPROJECT"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(A download utility (wget, curl, or fetch) is required to download bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${BZIP2}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(bzip2 is required to extract the pjproject tar file)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${TAR}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(tar is required to extract the pjproject tar file)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${PATCH}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(patch is required to configure bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${SED}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(sed is required to configure bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${NM}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(nm is required to build bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${MD5}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(md5sum is required to build bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${CAT}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(cat is required to build bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${CUT}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(cut is required to build bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${GREP}" = ":" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(grep is required to build bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING(for embedded pjproject (may have to download))</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT(configuring)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])</span><br><span style="color: hsl(0, 100%, 40%);">- this_host=$(./config.sub $(./config.guess))</span><br><span style="color: hsl(0, 100%, 40%);">- if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(A download utility (wget, curl, or fetch) is required to download bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${BZIP2}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(bzip2 is required to extract the pjproject tar file)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${TAR}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(tar is required to extract the pjproject tar file)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${PATCH}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(patch is required to configure bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${SED}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(sed is required to configure bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${NM}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(nm is required to build bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${MD5}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(md5sum is required to build bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${CAT}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(cat is required to build bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${CUT}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(cut is required to build bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${GREP}" = ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(grep is required to build bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])</span><br><span style="color: hsl(120, 100%, 40%);">+ this_host=$(./config.sub $(./config.guess))</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ case $with_ssl in</span><br><span style="color: hsl(120, 100%, 40%);">+ n|no)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span style="color: hsl(120, 100%, 40%);">+ # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(120, 100%, 40%);">+ export NOISY_BUILD AST_DEVMODE</span><br><span style="color: hsl(120, 100%, 40%);">+ ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span style="color: hsl(120, 100%, 40%);">+ configure</span><br><span style="color: hsl(120, 100%, 40%);">+ if test $? -ne 0 ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT(failed)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_NOTICE(Unable to configure ${PJPROJECT_DIR})</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR(Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details.)</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_CHECKING(for bundled pjproject)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" echo_cflags)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"</span><br><span style="color: hsl(120, 100%, 40%);">+ PBX_PJPROJECT=1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJPROJECT], 1, [Define if your system has PJPROJECT])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJPROJECT_BUNDLED], 1, [Define if your system has PJPROJECT_BUNDLED])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], 1, [Define if your system has pjsip_dlg_create_uas_and_inc_lock declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJ_TRANSACTION_GRP_LOCK], 1, [Define if your system has pjsip_tsx_create_uac2 declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_REPLACE_MEDIA_STREAM], 1, [Define if your system has PJSIP_REPLACE_MEDIA_STREAM declared])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_GET_DEST_INFO], 1, [Define if your system has pjsip_get_dest_info declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2], 1, [Define if your system has pj_ssl_cert_load_from_files2 declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_EXTERNAL_RESOLVER], 1, [Define if your system has pjsip_endpt_set_ext_resolver declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_TLS_TRANSPORT_PROTO], 1, [Define if your system has PJSIP_TLS_TRANSPORT_PROTO])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_EVSUB_GRP_LOCK], 1, [Define if your system has PJSIP_EVSUB_GRP_LOCK])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_INV_SESSION_REF], 1, [Define if your system has PJSIP_INV_SESSION_REF])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_AUTH_CLT_DEINIT], 1, [Define if your system has pjsip_auth_clt_deinit declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_TSX_LAYER_FIND_TSX2], 1, [Define if your system has pjsip_tsx_layer_find_tsx2 declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS], 1, [Define if your system has HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_ENDPOINT_COMPACT_FORM], 1, [Define if your system has HAVE_PJSIP_ENDPOINT_COMPACT_FORM declared.])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE], 1, [Define if your system has HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE declared])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJSIP_OAUTH_AUTHENTICATION], 1, [Define if your system has HAVE_PJSIP_OAUTH_AUTHENTICATION declared])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK], 1, [Define if your system has the on_valid_pair pjnath callback.])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([PJPROJECT_BUNDLED])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([PJPROJECT_DIR])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([PBX_PJPROJECT])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([PJPROJECT_LIB])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([PJPROJECT_INCLUDE])</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT(yes)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">- if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(0, 100%, 40%);">- # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(0, 100%, 40%);">- case $with_ssl in</span><br><span style="color: hsl(0, 100%, 40%);">- n|no)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- y|ye|yes)</span><br><span style="color: hsl(0, 100%, 40%);">- # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span style="color: hsl(0, 100%, 40%);">- # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- esac</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(0, 100%, 40%);">- export NOISY_BUILD AST_DEVMODE</span><br><span style="color: hsl(0, 100%, 40%);">- ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span style="color: hsl(0, 100%, 40%);">- EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span style="color: hsl(0, 100%, 40%);">- configure</span><br><span style="color: hsl(0, 100%, 40%);">- if test $? -ne 0 ; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_RESULT(failed)</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_NOTICE(Unable to configure ${PJPROJECT_DIR})</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_ERROR(Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details.)</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_CHECKING(for bundled pjproject)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" echo_cflags)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE"</span><br><span style="color: hsl(0, 100%, 40%);">- PBX_PJPROJECT=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJPROJECT], 1, [Define if your system has PJPROJECT])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJPROJECT_BUNDLED], 1, [Define if your system has PJPROJECT_BUNDLED])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK], 1, [Define if your system has pjsip_dlg_create_uas_and_inc_lock declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJ_TRANSACTION_GRP_LOCK], 1, [Define if your system has pjsip_tsx_create_uac2 declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_REPLACE_MEDIA_STREAM], 1, [Define if your system has PJSIP_REPLACE_MEDIA_STREAM declared])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_GET_DEST_INFO], 1, [Define if your system has pjsip_get_dest_info declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2], 1, [Define if your system has pj_ssl_cert_load_from_files2 declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_EXTERNAL_RESOLVER], 1, [Define if your system has pjsip_endpt_set_ext_resolver declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_TLS_TRANSPORT_PROTO], 1, [Define if your system has PJSIP_TLS_TRANSPORT_PROTO])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_EVSUB_GRP_LOCK], 1, [Define if your system has PJSIP_EVSUB_GRP_LOCK])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_INV_SESSION_REF], 1, [Define if your system has PJSIP_INV_SESSION_REF])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_AUTH_CLT_DEINIT], 1, [Define if your system has pjsip_auth_clt_deinit declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_TSX_LAYER_FIND_TSX2], 1, [Define if your system has pjsip_tsx_layer_find_tsx2 declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS], 1, [Define if your system has HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJSIP_ENDPOINT_COMPACT_FORM], 1, [Define if your system has HAVE_PJSIP_ENDPOINT_COMPACT_FORM declared.])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE([HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK], 1, [Define if your system has the on_valid_pair pjnath callback.])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST([PJPROJECT_BUNDLED])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST([PJPROJECT_DIR])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST([PBX_PJPROJECT])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST([PJPROJECT_LIB])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST([PJPROJECT_INCLUDE])</span><br><span style="color: hsl(0, 100%, 40%);">- AC_MSG_RESULT(yes)</span><br><span> ])</span><br><span> </span><br><span> AC_DEFUN([PJPROJECT_CONFIGURE],</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14218">change 14218</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14218"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Id057324912a3cfe6f50af372675626bb515907d9 </div>
<div style="display:none"> Gerrit-Change-Number: 14218 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>