[sheepdog] [[PATCH v1] ] add libcorosync_common depen

[Hitoshi Mitake]

At Thu,  2 Jul 2015 16:17:14 +0300,
Vasiliy Tolstov wrote:
> 
> when build with corosync 2.x libcorosync_common needs to be linked
> 
> Signed-off-by: Vasiliy Tolstov <v.tolstov at selfip.ru>
> ---
>  configure.ac      | 1 +
>  sheep/Makefile.am | 8 +++++---
>  2 files changed, 6 insertions(+), 3 deletions(-)

Applied, thanks. BTW, is it possible to write a patch which makes
build with corosync 1.x fail, Vasiliy?

As far as we know, Corosync 1.x has as serious bug in its message
drivery mechanism. In addition, current corosync driver heavily
depends on 2.x specific API semantics. Therefore, I want to let
build with corosync 1.x fail unconditionally. If you can write a
patch, it is very helpful for us :)

Thanks,
Hitoshi


> 
> diff --git a/configure.ac b/configure.ac
> index adc3dc1..e637f42 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -352,6 +352,7 @@ if test "x${enable_corosync}" = xyes; then
>  	PKG_CHECK_MODULES([libcpg],[libcpg])
>  	PKG_CHECK_MODULES([libcfg],[libcfg])
>  	PKG_CHECK_MODULES([libqb],[libqb])
> +	PKG_CHECK_MODULES([libcorosync_common],[libcorosync_common])
>  	AC_DEFINE_UNQUOTED([HAVE_COROSYNC], 1, [have corosync])
>  	PACKAGE_FEATURES="$PACKAGE_FEATURES corosync"
>  fi
> diff --git a/sheep/Makefile.am b/sheep/Makefile.am
> index e974c63..70ee0fc 100644
> --- a/sheep/Makefile.am
> +++ b/sheep/Makefile.am
> @@ -20,7 +20,8 @@ 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) $(libcpg_CFLAGS) $(libcfg_CFLAGS) \
> +			  $(libqb_CFLAGS)  $(libcorosync_common_CFLAGS)
>  
>  sbin_PROGRAMS		= sheep
>  
> @@ -55,8 +56,9 @@ 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 \
> +			  $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS) \
> +			  $(libqb_LIBS) $(libcorosync_common_LIBS)
>  
>  if BUILD_NFS
>  sheep_LDADD		+= -lrt
> -- 
> 2.3.3
> 
> -- 
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> https://lists.wpkg.org/mailman/listinfo/sheepdog