<p>Corey Farrell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/7382">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">autoconf: Use m4 conditional in AST_C_COMPILE_CHECK.<br><br>Change-Id: I530c0a72f965437acef6a9a4fbfe5c487f078b65<br>---<br>M autoconf/ast_c_compile_check.m4<br>M configure<br>2 files changed, 9 insertions(+), 61 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/82/7382/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4<br>index ed15630..ebdaefa 100644<br>--- a/autoconf/ast_c_compile_check.m4<br>+++ b/autoconf/ast_c_compile_check.m4<br>@@ -4,11 +4,7 @@<br> AC_DEFUN([AST_C_COMPILE_CHECK],<br> [<br>     if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then<br>-        if test "x$5" != "x"; then<br>-            AC_MSG_CHECKING([for $5])<br>-  else<br>-            AC_MSG_CHECKING([if "$2" compiles using $3])<br>-    fi<br>+   AC_MSG_CHECKING(m4_ifval([$5],[for $5],[if "$2" compiles using $3]))<br>        saved_cppflags="${CPPFLAGS}"<br>        if test "x${$1_DIR}" != "x"; then<br>             $1_INCLUDE="-I${$1_DIR}/include"<br>diff --git a/configure b/configure<br>index 1382f17..4ffcc73 100755<br>--- a/configure<br>+++ b/configure<br>@@ -20941,13 +20941,8 @@<br> <br> <br>     if test "x${PBX_DAHDI_LINEREVERSE_VMWI}" != "x1" -a "${USE_DAHDI_LINEREVERSE_VMWI}" != "no"; then<br>-        if test "xenhanced dahdi vmwi support" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5<br>+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5<br> $as_echo_n "checking for enhanced dahdi vmwi support... " >&6; }<br>-  else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h" >&5<br>-$as_echo_n "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h... " >&6; }<br>- fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${DAHDI_LINEREVERSE_VMWI_DIR}" != "x"; then<br>         DAHDI_LINEREVERSE_VMWI_INCLUDE="-I${DAHDI_LINEREVERSE_VMWI_DIR}/include"<br>@@ -20987,13 +20982,8 @@<br> <br> <br>     if test "x${PBX_DAHDI_ECHOCANCEL_FAX_MODE}" != "x1" -a "${USE_DAHDI_ECHOCANCEL_FAX_MODE}" != "no"; then<br>-        if test "x" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5<br>-$as_echo_n "checking for ... " >&6; }<br>-      else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5<br>+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5<br> $as_echo_n "checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h... " >&6; }<br>-        fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${DAHDI_ECHOCANCEL_FAX_MODE_DIR}" != "x"; then<br>      DAHDI_ECHOCANCEL_FAX_MODE_INCLUDE="-I${DAHDI_ECHOCANCEL_FAX_MODE_DIR}/include"<br>@@ -21033,13 +21023,8 @@<br> <br> <br>     if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then<br>-        if test "xgetifaddrs() support" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5<br>+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5<br> $as_echo_n "checking for getifaddrs() support... " >&6; }<br>-        else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5<br>-$as_echo_n "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... " >&6; }<br>-       fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${GETIFADDRS_DIR}" != "x"; then<br>             GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include"<br>@@ -21078,13 +21063,8 @@<br> <br> <br>     if test "x${PBX_TIMERFD}" != "x1" -a "${USE_TIMERFD}" != "no"; then<br>-        if test "xtimerfd support" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5<br>+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5<br> $as_echo_n "checking for timerfd support... " >&6; }<br>-  else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h" >&5<br>-$as_echo_n "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h... " >&6; }<br>- fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${TIMERFD_DIR}" != "x"; then<br>        TIMERFD_INCLUDE="-I${TIMERFD_DIR}/include"<br>@@ -21491,13 +21471,8 @@<br>    else<br> <br>     if test "x${PBX_LIBEDIT_IS_UNICODE}" != "x1" -a "${USE_LIBEDIT_IS_UNICODE}" != "no"; then<br>-        if test "xTesting for libedit unicode support" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5<br>+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5<br> $as_echo_n "checking for Testing for libedit unicode support... " >&6; }<br>-  else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"el_rfunc_t *callback;\" compiles using histedit.h" >&5<br>-$as_echo_n "checking if \"el_rfunc_t *callback;\" compiles using histedit.h... " >&6; }<br>-     fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${LIBEDIT_IS_UNICODE_DIR}" != "x"; then<br>             LIBEDIT_IS_UNICODE_INCLUDE="-I${LIBEDIT_IS_UNICODE_DIR}/include"<br>@@ -26204,13 +26179,8 @@<br>       LIBS="${LIBS} ${PJPROJECT_LIB}"<br> <br>     if test "x${PBX_PJSIP_REPLACE_MEDIA_STREAM}" != "x1" -a "${USE_PJSIP_REPLACE_MEDIA_STREAM}" != "no"; then<br>-        if test "x" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5<br>-$as_echo_n "checking for ... " >&6; }<br>-     else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5<br>+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5<br> $as_echo_n "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; }<br>-    fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${PJSIP_REPLACE_MEDIA_STREAM_DIR}" != "x"; then<br>             PJSIP_REPLACE_MEDIA_STREAM_INCLUDE="-I${PJSIP_REPLACE_MEDIA_STREAM_DIR}/include"<br>@@ -26569,13 +26539,8 @@<br>       LIBS="${LIBS} ${PJPROJECT_LIB}"<br> <br>     if test "x${PBX_PJSIP_TLS_TRANSPORT_PROTO}" != "x1" -a "${USE_PJSIP_TLS_TRANSPORT_PROTO}" != "no"; then<br>-        if test "x" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5<br>-$as_echo_n "checking for ... " >&6; }<br>-       else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5<br>+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5<br> $as_echo_n "checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h... " >&6; }<br>-  fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${PJSIP_TLS_TRANSPORT_PROTO_DIR}" != "x"; then<br>      PJSIP_TLS_TRANSPORT_PROTO_INCLUDE="-I${PJSIP_TLS_TRANSPORT_PROTO_DIR}/include"<br>@@ -29944,21 +29909,8 @@<br> <br> <br>     if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then<br>-        if test "xminimum version of SpanDSP" != "x"; then<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5<br>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5<br> $as_echo_n "checking for minimum version of SpanDSP... " >&6; }<br>-    else<br>-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"<br>-         #if SPANDSP_RELEASE_DATE < 20080516<br>-               #error \"spandsp 0.0.5 or greater is required\"<br>-            #endif<br>-       \" compiles using spandsp/version.h" >&5<br>-$as_echo_n "checking if \"<br>-             #if SPANDSP_RELEASE_DATE < 20080516<br>-               #error \"spandsp 0.0.5 or greater is required\"<br>-            #endif<br>-       \" compiles using spandsp/version.h... " >&6; }<br>-     fi<br>    saved_cppflags="${CPPFLAGS}"<br>        if test "x${SPANDSP_DIR}" != "x"; then<br>        SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7382">change 7382</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/7382"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I530c0a72f965437acef6a9a4fbfe5c487f078b65 </div>
<div style="display:none"> Gerrit-Change-Number: 7382 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>