diff options
| author | Matt Jordan <mjordan@digium.com> | 2017-10-06 10:51:17 -0500 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-10-17 07:13:19 -0500 |
| commit | 312a338531b6c9f08f1f6db0748c3b81330fcbb4 (patch) | |
| tree | 08dc5df2fc5f4c9c36ca9d95e8c5f3b603c4d653 | |
| parent | f3225025a1ae35bb2072d01e47f5f0a6681be116 (diff) | |
res_corosync: Fix linking issue with Corosync 2.x
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
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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" diff --git a/configure.ac b/configure.ac index cf4518c21..9f95786e1 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) |