<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7423">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">autoconf: Remove use of m4_ifblank.<br><br>The m4_ifblank macro is not available on CentOS 6, reverse conditionals<br>to allow use of m4_ifval instead. ./bootstrap.sh was run but this patch<br>does not result in any difference to the generated configure script.<br><br>Change-Id: I280785deb872ed8d3339d99cce63a2b54d5f1438<br>---<br>M autoconf/ast_check_pwlib.m4<br>M autoconf/ast_ext_lib.m4<br>M autoconf/ast_gcc_attribute.m4<br>3 files changed, 13 insertions(+), 13 deletions(-)<br><br></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 4588fa3..8ec2d58 100644<br>--- a/autoconf/ast_check_pwlib.m4<br>+++ b/autoconf/ast_check_pwlib.m4<br>@@ -200,7 +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>- $2_MAX=m4_ifblank([$10], [9999999], [$(($8*10000+$9*100+$10))])<br>+ $2_MAX=m4_ifval([$10], [$(($8*10000+$9*100+$10))], [9999999])<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/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4<br>index e8ce201..080b8c3 100644<br>--- a/autoconf/ast_ext_lib.m4<br>+++ b/autoconf/ast_ext_lib.m4<br>@@ -117,14 +117,14 @@<br> pbxlibdir="-L${$1_DIR}"<br> fi<br> fi<br>- m4_ifblank([$3], [<br>- # empty lib, assume only headers<br>- AST_$1_FOUND=yes<br>- ], [<br>+ m4_ifval([$3], [<br> ast_ext_lib_check_save_CFLAGS="${CFLAGS}"<br> CFLAGS="${CFLAGS} $6"<br> AC_CHECK_LIB([$2], [$3], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5])<br> CFLAGS="${ast_ext_lib_check_save_CFLAGS}"<br>+ ], [<br>+ # empty lib, assume only headers<br>+ AST_$1_FOUND=yes<br> ])<br> <br> # now check for the header.<br>@@ -135,21 +135,21 @@<br> $1_INCLUDE="-I${$1_DIR}/include"<br> fi<br> $1_INCLUDE="${$1_INCLUDE} $6"<br>- m4_ifblank([$4], [<br>- # no header, assume found<br>- $1_HEADER_FOUND="1"<br>- ], [<br>+ m4_ifval([$4], [<br> # check for the header<br> ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br> CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"<br> AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])<br> CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>+ ], [<br>+ # no header, assume found<br>+ $1_HEADER_FOUND="1"<br> ])<br> if test "x${$1_HEADER_FOUND}" = "x0" ; then<br> $1_LIB=""<br> $1_INCLUDE=""<br> else<br>- m4_ifblank([$3], [<br>+ m4_ifval([$3], [], [<br> # only checking headers -> no library<br> $1_LIB=""<br> ])<br>diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4<br>index 9d5a320..0286853 100644<br>--- a/autoconf/ast_gcc_attribute.m4<br>+++ b/autoconf/ast_gcc_attribute.m4<br>@@ -11,9 +11,9 @@<br> <br> AC_COMPILE_IFELSE(<br> [AC_LANG_PROGRAM(<br>- m4_ifblank([$2],<br>- [$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],<br>- [$3 void __attribute__(($2)) *test(void *muffin, ...) ;]))],<br>+ m4_ifval([$2],<br>+ [$3 void __attribute__(($2)) *test(void *muffin, ...) ;],<br>+ [$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}]))],<br> AC_MSG_RESULT(yes)<br> m4_ifval([$4],$4=1)<br> ax_cv_have_func_attribute_$1=1<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7423">change 7423</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/7423"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I280785deb872ed8d3339d99cce63a2b54d5f1438 </div>
<div style="display:none"> Gerrit-Change-Number: 7423 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>