<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14213">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Only if found LibPRI, check its optional parts.<br><br>Change-Id: If8445f899ee4ce0c606c484943d4ce0c8e43b5da<br>---<br>M configure<br>M configure.ac<br>2 files changed, 32 insertions(+), 28 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 30659f5..abb8481 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -26763,6 +26763,7 @@</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$PBX_PRI" = "x1" ; then</span><br><span> </span><br><span> if test "x${PBX_PRI_SETUP_ACK_INBAND}" != "x1" -a "${USE_PRI_SETUP_ACK_INBAND}" != "no"; then</span><br><span>    pbxlibdir=""</span><br><span>@@ -28300,9 +28301,9 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# ------------------------------------v</span><br><span style="color: hsl(0, 100%, 40%);">-# TODO: The code can be changed to always include these features now.</span><br><span style="color: hsl(0, 100%, 40%);">-# These features will always be present if pri_connected_line_update is available.</span><br><span style="color: hsl(120, 100%, 40%);">+   # ------------------------------------v</span><br><span style="color: hsl(120, 100%, 40%);">+   # TODO: The code can be changed to always include these features now.</span><br><span style="color: hsl(120, 100%, 40%);">+   # These features will always be present if pri_connected_line_update is available.</span><br><span> </span><br><span> if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; then</span><br><span>    pbxlibdir=""</span><br><span>@@ -28687,7 +28688,8 @@</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# ------------------------------------^</span><br><span style="color: hsl(120, 100%, 40%);">+   # ------------------------------------^</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> </span><br><span> if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 1c7e884..1ae50a6 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -2488,31 +2488,33 @@</span><br><span> AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])</span><br><span> </span><br><span> AST_EXT_LIB_CHECK([PRI], [pri], [pri_connected_line_update], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_SETUP_ACK_INBAND], [pri], [pri_setup_ack], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_L2_PERSISTENCE], [pri], [pri_persistent_layer2_option], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_DATETIME_SEND], [pri], [pri_date_time_send_option], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_MWI_V2], [pri], [pri_mwi_indicate_v2], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_DISPLAY_TEXT], [pri], [pri_display_text], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_MWI], [pri], [pri_mwi_indicate], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_MCID], [pri], [pri_mcid_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_CALL_WAITING], [pri], [pri_connect_ack_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_AOC_EVENTS], [pri], [pri_aoc_events_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_TRANSFER], [pri], [pri_transfer_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_CCSS], [pri], [pri_cc_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_HANGUP_FIX], [pri], [pri_hangup_fix_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_SUBADDR], [pri], [pri_sr_set_called_subaddress], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_CALL_HOLD], [pri], [pri_hold_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_CALL_REROUTING], [pri], [pri_reroute_enable], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_SETUP_KEYPAD], [pri], [pri_sr_set_keypad_digits], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$PBX_PRI" = "x1" ; then</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_SETUP_ACK_INBAND], [pri], [pri_setup_ack], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_L2_PERSISTENCE], [pri], [pri_persistent_layer2_option], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_DATETIME_SEND], [pri], [pri_date_time_send_option], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_MWI_V2], [pri], [pri_mwi_indicate_v2], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_DISPLAY_TEXT], [pri], [pri_display_text], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_MWI], [pri], [pri_mwi_indicate], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_MCID], [pri], [pri_mcid_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_CALL_WAITING], [pri], [pri_connect_ack_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_AOC_EVENTS], [pri], [pri_aoc_events_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_TRANSFER], [pri], [pri_transfer_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_CCSS], [pri], [pri_cc_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_HANGUP_FIX], [pri], [pri_hangup_fix_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_SUBADDR], [pri], [pri_sr_set_called_subaddress], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_CALL_HOLD], [pri], [pri_hold_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_CALL_REROUTING], [pri], [pri_reroute_enable], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_SETUP_KEYPAD], [pri], [pri_sr_set_keypad_digits], [libpri.h])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# ------------------------------------v</span><br><span style="color: hsl(0, 100%, 40%);">-# TODO: The code can be changed to always include these features now.</span><br><span style="color: hsl(0, 100%, 40%);">-# These features will always be present if pri_connected_line_update is available.</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_PROG_W_CAUSE], [pri], [pri_progress_with_cause], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_SERVICE_MESSAGES], [pri], [pri_maintenance_service], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([PRI_REVERSE_CHARGE], [pri], [pri_sr_set_reversecharge], [libpri.h])</span><br><span style="color: hsl(0, 100%, 40%);">-# ------------------------------------^</span><br><span style="color: hsl(120, 100%, 40%);">+   # ------------------------------------v</span><br><span style="color: hsl(120, 100%, 40%);">+   # TODO: The code can be changed to always include these features now.</span><br><span style="color: hsl(120, 100%, 40%);">+   # These features will always be present if pri_connected_line_update is available.</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_PROG_W_CAUSE], [pri], [pri_progress_with_cause], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_SERVICE_MESSAGES], [pri], [pri_maintenance_service], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   AST_EXT_LIB_CHECK([PRI_REVERSE_CHARGE], [pri], [pri_sr_set_reversecharge], [libpri.h])</span><br><span style="color: hsl(120, 100%, 40%);">+   # ------------------------------------^</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])</span><br><span> AST_EXT_LIB_CHECK([FFTW3], [fftw3], [fftw_malloc], [fftw3.h])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14213">change 14213</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/+/14213"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If8445f899ee4ce0c606c484943d4ce0c8e43b5da </div>
<div style="display:none"> Gerrit-Change-Number: 14213 </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-MessageType: merged </div>