diff options
author | Matt Jordan <mjordan@digium.com> | 2017-10-06 10:51:17 -0500 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2017-10-17 11:22:43 +0000 |
commit | 0a11097a229100a590b401b4b007b038bef26f72 (patch) | |
tree | 74b06b53a8747c33af9df05ff4119e88991763ab /configure.ac | |
parent | 944e500e95c3eebbae83fe3d08fb0b7b3718b934 (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
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6c5f4e3cb..1cdeea93c 100644 --- a/configure.ac +++ b/configure.ac @@ -2374,7 +2374,7 @@ else AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) fi -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]) |