<p>Corey Farrell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/7391">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">autoconf: Use m4 conditional in AST_CHECK_PWLIB_VERSION.<br><br>Change-Id: I8f6208fd8a8627cdaac3500b2b304c64d9bab238<br>---<br>M autoconf/ast_check_pwlib.m4<br>M configure<br>2 files changed, 6 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/91/7391/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4<br>index 81c3f40..4588fa3 100644<br>--- a/autoconf/ast_check_pwlib.m4<br>+++ b/autoconf/ast_check_pwlib.m4<br>@@ -191,11 +191,7 @@<br> ])<br> <br> AC_DEFUN([AST_CHECK_PWLIB_VERSION], [<br>-     if test "x$7" != "x"; then<br>-               VNAME="$7"<br>-         else<br>-         VNAME="$2_VERSION"<br>- fi<br>+   VNAME="m4_default([$7],[$2_VERSION])"<br> <br>    if test "${HAS_$2:-unset}" != "unset"; then<br>               $2_VERSION=`grep "$VNAME \"" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>@@ -204,11 +200,7 @@<br>               $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`<br>            $2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))<br>              $2_REQ=$(($4*10000+$5*100+$6))<br>-               if test "x$10" = "x"; then<br>-                       $2_MAX=9999999<br>-               else<br>-                 $2_MAX=$(($8*10000+$9*100+$10))<br>-              fi<br>+           $2_MAX=m4_ifblank([$10], [9999999], [$(($8*10000+$9*100+$10))])<br> <br>            AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)<br>             if test ${$2_VER} -lt ${$2_REQ}; then<br>diff --git a/configure b/configure<br>index eca9c8d..2dd0277 100755<br>--- a/configure<br>+++ b/configure<br>@@ -29020,11 +29020,7 @@<br> <br> <br> <br>-        if test "xP[WT]LIB_VERSION" != "x"; then<br>-         VNAME="P[WT]LIB_VERSION"<br>-           else<br>-         VNAME="PWLIB_VERSION"<br>-      fi<br>+   VNAME="P[WT]LIB_VERSION"<br> <br>         if test "${HAS_PWLIB:-unset}" != "unset"; then<br>            PWLIB_VERSION=`grep "$VNAME \"" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>@@ -29033,11 +29029,7 @@<br>            PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.`<br>              PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}))<br>          PWLIB_REQ=$((1*10000+9*100+2))<br>-               if test "x" = "x"; then<br>-                  PWLIB_MAX=9999999<br>-            else<br>-                 PWLIB_MAX=$((*10000+*100+))<br>-          fi<br>+           PWLIB_MAX=9999999<br> <br>          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5<br> $as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; }<br>@@ -29353,11 +29345,7 @@<br> <br> <br> <br>- if test "x" != "x"; then<br>-         VNAME=""<br>-           else<br>-         VNAME="OPENH323_VERSION"<br>-   fi<br>+   VNAME="OPENH323_VERSION"<br> <br>         if test "${HAS_OPENH323:-unset}" != "unset"; then<br>                 OPENH323_VERSION=`grep "$VNAME \"" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>@@ -29366,11 +29354,7 @@<br>                OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.`<br>                OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}))<br>              OPENH323_REQ=$((1*10000+17*100+3))<br>-           if test "x0" = "x"; then<br>-                 OPENH323_MAX=9999999<br>-         else<br>-                 OPENH323_MAX=$((1*10000+19*100+0))<br>-           fi<br>+           OPENH323_MAX=$((1*10000+19*100+0))<br> <br>                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5<br> $as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7391">change 7391</a>. To unsubscribe, 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/7391"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8f6208fd8a8627cdaac3500b2b304c64d9bab238 </div>
<div style="display:none"> Gerrit-Change-Number: 7391 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>