<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6824">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_corosync: Fix linking issue with Corosync 2.x<br><br>At some point in time in the history of Corosync (certainly within the<br>2.x branch), the corosync_cfg_state_track function was removed.<br>Unfortunately, the cfg library is only linked if this function is<br>present. Without the cfg library being linked to res_corosync, loading<br>of res_corosync will fail.<br><br>This patch makes it so that detecting corosync's core libraries,<br>determined by the COROSYNC external library checks, links both the cpg<br>and cfg libraries with res_corosync.<br><br>Change-Id: I674e9e1c8fea11c3bf81154aaa7c1fd43f945465<br>---<br>M configure<br>M configure.ac<br>2 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 368e6b4..59bc3b1 100755<br>--- a/configure<br>+++ b/configure<br>@@ -31953,7 +31953,7 @@<br>   $as_echo_n "(cached) " >&6<br> else<br>   ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lcpg ${pbxlibdir} -lcpg $LIBS"<br>+LIBS="-lcpg ${pbxlibdir} -lcpg -lcfg $LIBS"<br> cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h.  */<br> <br>@@ -31995,7 +31995,7 @@<br> <br>    # now check for the header.<br>    if test "${AST_COROSYNC_FOUND}" = "yes"; then<br>-      COROSYNC_LIB="${pbxlibdir} -lcpg -lcpg"<br>+      COROSYNC_LIB="${pbxlibdir} -lcpg -lcpg -lcfg"<br>       # if --with-COROSYNC=DIR has been specified, use it.<br>       if test "x${COROSYNC_DIR}" != "x"; then<br>          COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include"<br>diff --git a/configure.ac b/configure.ac<br>index cf4518c..9f95786 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2425,7 +2425,7 @@<br> <br> AST_EXT_LIB_CHECK([CODEC2], [codec2], [codec2_create], [codec2/codec2.h])<br> <br>-AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg])<br>+AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg -lcfg])<br> AST_EXT_LIB_CHECK([COROSYNC_CFG_STATE_TRACK], [cfg], [corosync_cfg_state_track], [corosync/cfg.h], [-lcfg])<br> <br> AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6824">change 6824</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/6824"/><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: I674e9e1c8fea11c3bf81154aaa7c1fd43f945465 </div>
<div style="display:none"> Gerrit-Change-Number: 6824 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.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>