[sheepdog] [PATCH v2] add libcorosync_common depen

[Vasiliy Tolstov]

when build with corosync 2.x libcorosync_common needs to be linked

Signed-off-by: Vasiliy Tolstov <v.tolstov at selfip.ru>
---
 configure.ac      | 10 +++++++---
 sheep/Makefile.am |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index adc3dc1..6735fd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,12 +348,16 @@ else
 fi
 
 if test "x${enable_corosync}" = xyes; then
-	PKG_CHECK_MODULES([corosync],[corosync])
 	PKG_CHECK_MODULES([libcpg],[libcpg])
 	PKG_CHECK_MODULES([libcfg],[libcfg])
-	PKG_CHECK_MODULES([libqb],[libqb])
+	PKG_CHECK_MODULES([libcorosync],[corosync])
 	AC_DEFINE_UNQUOTED([HAVE_COROSYNC], 1, [have corosync])
 	PACKAGE_FEATURES="$PACKAGE_FEATURES corosync"
+	libcorosync_LIBS+="$(libcpg_LIBS) $(libcfg_LIBS)"
+	PKG_CHECK_MODULES([corosync2],[corosync >= 2],
+		PKG_CHECK_MODULES([libqb],[libqb])
+		PKG_CHECK_MODULES([libcorosync_common],[libcorosync_common])
+		libcorosync_LIBS+="$(libqb_LIBS) $(libcorosync_common_LIBS)",)
 fi
 
 if test "x${enable_zookeeper}" = xyes; then
@@ -553,7 +557,7 @@ AC_MSG_RESULT([  State information        = ${localstatedir}])
 AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
 AC_MSG_RESULT([  System init.d directory  = ${INITDDIR}])
 AC_MSG_RESULT([  sheepdog config dir      = ${COROSYSCONFDIR}])
-AC_MSG_RESULT([  Features                 =${PACKAGE_FEATURES}])
+AC_MSG_RESULT([  Features                 = ${PACKAGE_FEATURES}])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE build info:])
 AC_MSG_RESULT([  Library SONAME           = ${SONAME}])
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index e974c63..e02acf9 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -20,7 +20,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 AM_CFLAGS		=
 
 AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include \
-			  $(libqb_CFLAGS) $(libcpg_CFLAGS) $(libcfg_CFLAGS) $(libacrd_CFLAGS)
+			  $(libacrd_CFLAGS)
 
 sbin_PROGRAMS		= sheep
 
@@ -55,8 +55,8 @@ AM_CPPFLAGS		+= -DENABLE_TRACE
 sheep_SOURCES		+= trace/trace.c trace/mcount.S trace/graph.c trace/checker.c
 endif
 
-sheep_LDADD	  	= ../lib/libsd.a -lpthread -lm\
-			  $(libqb_LIBS) $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS)
+sheep_LDADD	  	= ../lib/libsd.a -lpthread -lm \
+			  $(libacrd_LIBS) $(libcorosync_LIBS) $(LIBS)
 
 if BUILD_NFS
 sheep_LDADD		+= -lrt
-- 
2.3.3