sometimes libcfg and libcpg does not have libqb dependencies, but libqb need to be present to link with libcpg and libcfg
Signed-off-by: Vasiliy Tolstov <[email protected]> --- configure.ac | 1 + sheep/Makefile.am | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index cae4771..adc3dc1 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,7 @@ 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]) 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 3a11d8f..e974c63 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 \ - $(libcpg_CFLAGS) $(libcfg_CFLAGS) $(libacrd_CFLAGS) + $(libqb_CFLAGS) $(libcpg_CFLAGS) $(libcfg_CFLAGS) $(libacrd_CFLAGS) sbin_PROGRAMS = sheep @@ -56,7 +56,7 @@ sheep_SOURCES += trace/trace.c trace/mcount.S trace/graph.c trace/checker.c endif sheep_LDADD = ../lib/libsd.a -lpthread -lm\ - $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS) + $(libqb_LIBS) $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS) if BUILD_NFS sheep_LDADD += -lrt @@ -68,7 +68,7 @@ sheep_DEPENDENCIES = ../lib/libsd.a noinst_HEADERS = sheep_priv.h cluster.h http/http.h trace/trace.h nfs/nfs.h nfs/fs.h -EXTRA_DIST = +EXTRA_DIST = if BUILD_EARTHQUAKE sheep_LDADD += -leq_embed @@ -82,7 +82,7 @@ if BUILD_LTTNG_UST sheep_SOURCES += tracepoint/request_tp.c endif -all-local: +all-local: @echo Built sheep clean-local: -- 2.3.3 -- sheepdog mailing list [email protected] https://lists.wpkg.org/mailman/listinfo/sheepdog
