<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17329">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Consistently allow 'ye' even for Jansson.<br><br>Furthermore, consistently use not 'No' but ':' for non-existent file<br>paths. Finally, use the same pattern for checking file paths:<br> a) = ":"<br> b) != "x:"<br><br>Change-Id: I0c80c76d2cc98b0e5c859131290f4e3141a1a544<br>---<br>M configure<br>M configure.ac<br>2 files changed, 35 insertions(+), 33 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 40aa43b..e227e22 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -4964,7 +4964,7 @@</span><br><span> fi</span><br><span> </span><br><span> if test "x$ac_pt_UNAME" = x; then</span><br><span style="color: hsl(0, 100%, 40%);">- UNAME="No"</span><br><span style="color: hsl(120, 100%, 40%);">+ UNAME=":"</span><br><span> else</span><br><span> case $cross_compiling:$ac_tool_warned in</span><br><span> yes:)</span><br><span>@@ -4978,7 +4978,7 @@</span><br><span> UNAME="$ac_cv_path_UNAME"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test ! x"${UNAME}" = xNo; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${UNAME}" != "x:"; then</span><br><span> PBX_OSREV=$(${UNAME} -r)</span><br><span> fi</span><br><span> </span><br><span>@@ -7702,11 +7702,11 @@</span><br><span> DOWNLOAD=":"</span><br><span> DOWNLOAD_TO_STDOUT=</span><br><span> DOWNLOAD_TIMEOUT=</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${WGET}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${WGET}" != "x:"; then</span><br><span> DOWNLOAD=${WGET}</span><br><span> DOWNLOAD_TO_STDOUT="${WGET} -q -O-"</span><br><span> DOWNLOAD_TIMEOUT='--timeout=$1'</span><br><span style="color: hsl(0, 100%, 40%);">-elif test "${CURL}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+elif test "x${CURL}" != "x:"; then</span><br><span> DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""</span><br><span> DOWNLOAD_TO_STDOUT="${CURL} -Ls"</span><br><span> DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'</span><br><span>@@ -7752,7 +7752,7 @@</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if test "${FETCH}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${FETCH}" != "x:"; then</span><br><span> DOWNLOAD=${FETCH}</span><br><span> DOWNLOAD_TO_STDOUT="${FETCH} -o-"</span><br><span> DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'</span><br><span>@@ -8051,21 +8051,22 @@</span><br><span> PBX_BISON=1</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${FLEX}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${FLEX}" = ":"; then</span><br><span> PBX_FLEX=0</span><br><span> else</span><br><span> PBX_FLEX=1</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${XMLSTARLET}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${XMLSTARLET}" = ":"; then</span><br><span> PBX_XMLSTARLET=0</span><br><span> else</span><br><span> PBX_XMLSTARLET=1</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${BASH}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${BASH}" = ":"; then</span><br><span> PBX_BASH=0</span><br><span> else</span><br><span> PBX_BASH=1</span><br><span>@@ -8164,7 +8165,7 @@</span><br><span> SOXMIX="$ac_cv_prog_SOXMIX"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "${SOXMIX}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${SOXMIX}" != "x:"; then</span><br><span> </span><br><span> $as_echo "#define HAVE_SOXMIX 1" >>confdefs.h</span><br><span> </span><br><span>@@ -9198,7 +9199,7 @@</span><br><span> # Check whether --with-jansson-bundled was given.</span><br><span> if test "${with_jansson_bundled+set}" = set; then :</span><br><span> withval=$with_jansson_bundled; case "${withval}" in</span><br><span style="color: hsl(0, 100%, 40%);">- y|yes) JANSSON_BUNDLED=yes ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes) JANSSON_BUNDLED=yes ;;</span><br><span> *) JANSSON_BUNDLED=no ;;</span><br><span> esac</span><br><span> fi</span><br><span>@@ -25135,7 +25136,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PG_CONFIG=No</span><br><span style="color: hsl(120, 100%, 40%);">+PG_CONFIG=":"</span><br><span> if test "${USE_PGSQL}" != "no"; then</span><br><span> if test "x${PGSQL_DIR}" != "x"; then</span><br><span> if test -n "$ac_tool_prefix"; then</span><br><span>@@ -25222,7 +25223,7 @@</span><br><span> fi</span><br><span> </span><br><span> if test "x$ac_pt_PG_CONFIG" = x; then</span><br><span style="color: hsl(0, 100%, 40%);">- PG_CONFIG="No"</span><br><span style="color: hsl(120, 100%, 40%);">+ PG_CONFIG=":"</span><br><span> else</span><br><span> case $cross_compiling:$ac_tool_warned in</span><br><span> yes:)</span><br><span>@@ -25236,7 +25237,7 @@</span><br><span> PG_CONFIG="$ac_cv_path_PG_CONFIG"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if test x"${PG_CONFIG}" = xNo; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${PG_CONFIG}" = ":"; then</span><br><span> { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5</span><br><span> $as_echo "$as_me: ***" >&6;}</span><br><span> { $as_echo "$as_me:${as_lineno-$LINENO}: *** pg_config was not found in the path you specified:" >&5</span><br><span>@@ -25334,7 +25335,7 @@</span><br><span> fi</span><br><span> </span><br><span> if test "x$ac_pt_PG_CONFIG" = x; then</span><br><span style="color: hsl(0, 100%, 40%);">- PG_CONFIG="No"</span><br><span style="color: hsl(120, 100%, 40%);">+ PG_CONFIG=":"</span><br><span> else</span><br><span> case $cross_compiling:$ac_tool_warned in</span><br><span> yes:)</span><br><span>@@ -25350,7 +25351,7 @@</span><br><span> </span><br><span> fi</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${PG_CONFIG}" != No; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${PG_CONFIG}" != "x:"; then</span><br><span> PGSQL_libdir=`${PG_CONFIG} --libdir`</span><br><span> PGSQL_includedir=`${PG_CONFIG} --includedir`</span><br><span> if test "x$?" != "x0" ; then</span><br><span>@@ -36609,7 +36610,7 @@</span><br><span> </span><br><span> </span><br><span> ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2</span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${ac_cv_path_CMP}" = "x:"; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${ac_cv_path_CMP}" = ":"; then</span><br><span> ( cd "`pwd`/menuselect" && ./configure )</span><br><span> elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else</span><br><span> ( cd "`pwd`/menuselect" && ./configure )</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 6cecdf0..6071ef4 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -211,8 +211,8 @@</span><br><span> AC_SUBST(CONFIG_SIGNED_CHAR)</span><br><span> </span><br><span> # check for uname</span><br><span style="color: hsl(0, 100%, 40%);">-AC_PATH_TOOL([UNAME], [uname], No)</span><br><span style="color: hsl(0, 100%, 40%);">-if test ! x"${UNAME}" = xNo; then</span><br><span style="color: hsl(120, 100%, 40%);">+AC_PATH_TOOL([UNAME], [uname], :)</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${UNAME}" != "x:"; then</span><br><span> PBX_OSREV=$(${UNAME} -r)</span><br><span> fi</span><br><span> AC_SUBST(PBX_OSREV)</span><br><span>@@ -289,17 +289,17 @@</span><br><span> DOWNLOAD=":"</span><br><span> DOWNLOAD_TO_STDOUT=</span><br><span> DOWNLOAD_TIMEOUT=</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${WGET}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${WGET}" != "x:"; then</span><br><span> DOWNLOAD=${WGET}</span><br><span> DOWNLOAD_TO_STDOUT="${WGET} -q -O-"</span><br><span> DOWNLOAD_TIMEOUT='--timeout=$1'</span><br><span style="color: hsl(0, 100%, 40%);">-elif test "${CURL}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+elif test "x${CURL}" != "x:"; then</span><br><span> DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""</span><br><span> DOWNLOAD_TO_STDOUT="${CURL} -Ls"</span><br><span> DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'</span><br><span> else</span><br><span> AC_PATH_PROG([FETCH], [fetch], :)</span><br><span style="color: hsl(0, 100%, 40%);">- if test "${FETCH}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x${FETCH}" != "x:"; then</span><br><span> DOWNLOAD=${FETCH}</span><br><span> DOWNLOAD_TO_STDOUT="${FETCH} -o-"</span><br><span> DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'</span><br><span>@@ -351,29 +351,30 @@</span><br><span> PBX_BISON=1</span><br><span> fi</span><br><span> AC_SUBST(PBX_BISON)</span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${FLEX}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${FLEX}" = ":"; then</span><br><span> PBX_FLEX=0</span><br><span> else</span><br><span> PBX_FLEX=1</span><br><span> fi</span><br><span> AC_SUBST(PBX_FLEX)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${XMLSTARLET}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${XMLSTARLET}" = ":"; then</span><br><span> PBX_XMLSTARLET=0</span><br><span> else</span><br><span> PBX_XMLSTARLET=1</span><br><span> fi</span><br><span> AC_SUBST(PBX_XMLSTARLET)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${BASH}" = "x:" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${BASH}" = ":"; then</span><br><span> PBX_BASH=0</span><br><span> else</span><br><span> PBX_BASH=1</span><br><span> fi</span><br><span> AC_SUBST(PBX_BASH)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AC_CHECK_TOOL([SOXMIX], [soxmix], [:])</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${SOXMIX}" != ":" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+AC_CHECK_TOOL([SOXMIX], [soxmix], :)</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${SOXMIX}" != "x:"; then</span><br><span> AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])</span><br><span> fi</span><br><span> </span><br><span>@@ -441,7 +442,7 @@</span><br><span> [AS_HELP_STRING([--with-jansson-bundled],</span><br><span> [Use bundled jansson library])],</span><br><span> [case "${withval}" in</span><br><span style="color: hsl(0, 100%, 40%);">- y|yes) JANSSON_BUNDLED=yes ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes) JANSSON_BUNDLED=yes ;;</span><br><span> *) JANSSON_BUNDLED=no ;;</span><br><span> esac])</span><br><span> </span><br><span>@@ -2393,11 +2394,11 @@</span><br><span> AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [sys/soundcard.h])</span><br><span> AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PG_CONFIG=No</span><br><span style="color: hsl(120, 100%, 40%);">+PG_CONFIG=":"</span><br><span> if test "${USE_PGSQL}" != "no"; then</span><br><span> if test "x${PGSQL_DIR}" != "x"; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PGSQL_DIR}/bin])</span><br><span style="color: hsl(0, 100%, 40%);">- if test x"${PG_CONFIG}" = xNo; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_PATH_TOOL([PG_CONFIG], [pg_config], :, [${PGSQL_DIR}/bin])</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${PG_CONFIG}" = ":"; then</span><br><span> AC_MSG_NOTICE([***])</span><br><span> AC_MSG_NOTICE([*** pg_config was not found in the path you specified:])</span><br><span> AC_MSG_NOTICE([*** ${PGSQL_DIR}/bin])</span><br><span>@@ -2406,10 +2407,10 @@</span><br><span> exit 1</span><br><span> fi</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- AC_PATH_TOOL([PG_CONFIG], [pg_config], No)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_PATH_TOOL([PG_CONFIG], [pg_config], :)</span><br><span> fi</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-if test "${PG_CONFIG}" != No; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${PG_CONFIG}" != "x:"; then</span><br><span> PGSQL_libdir=`${PG_CONFIG} --libdir`</span><br><span> PGSQL_includedir=`${PG_CONFIG} --includedir`</span><br><span> if test "x$?" != "x0" ; then</span><br><span>@@ -2946,7 +2947,7 @@</span><br><span> AC_OUTPUT</span><br><span> </span><br><span> ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2</span><br><span style="color: hsl(0, 100%, 40%);">-if test "x${ac_cv_path_CMP}" = "x:"; then</span><br><span style="color: hsl(120, 100%, 40%);">+if test "${ac_cv_path_CMP}" = ":"; then</span><br><span> ( cd "`pwd`/menuselect" && ./configure )</span><br><span> elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else</span><br><span> ( cd "`pwd`/menuselect" && ./configure )</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17329">change 17329</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/+/17329"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I0c80c76d2cc98b0e5c859131290f4e3141a1a544 </div>
<div style="display:none"> Gerrit-Change-Number: 17329 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.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-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>