kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 06:00:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_corosync: Fix linking issue with Corosync 2.x

Browse Source 
At some point in time in the history of Corosync (certainly within the
2.x branch), the corosync_cfg_state_track function was removed.
Unfortunately, the cfg library is only linked if this function is
present. Without the cfg library being linked to res_corosync, loading
of res_corosync will fail.

This patch makes it so that detecting corosync's core libraries,
determined by the COROSYNC external library checks, links both the cpg
and cfg libraries with res_corosync.

Change-Id: I674e9e1c8fea11c3bf81154aaa7c1fd43f945465
This commit is contained in:
Matt Jordan
2017-10-06 10:51:17 -05:00
parent 98076de152
commit f4798faacc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -31953,7 +31953,7 @@ if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcpg ${pbxlibdir} -lcpg $LIBS"
LIBS="-lcpg ${pbxlibdir} -lcpg -lcfg $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31995,7 +31995,7 @@ fi
# now check for the header.
if test "${AST_COROSYNC_FOUND}" = "yes"; then
COROSYNC_LIB="${pbxlibdir} -lcpg -lcpg"
COROSYNC_LIB="${pbxlibdir} -lcpg -lcpg -lcfg"
# if --with-COROSYNC=DIR has been specified, use it.
if test "x${COROSYNC_DIR}" != "x"; then
COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include"

2
configure.ac
View File

@@ -2425,7 +2425,7 @@ fi
AST_EXT_LIB_CHECK([CODEC2], [codec2], [codec2_create], [codec2/codec2.h])
AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg])
AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg -lcfg])
AST_EXT_LIB_CHECK([COROSYNC_CFG_STATE_TRACK], [cfg], [corosync_cfg_state_track], [corosync/cfg.h], [-lcfg])
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])