fix ubuntu build with both libcap-dev and libcapng (#8596)
Timo committed
Apr 3, 2020 at 17:38 UTC
ba56c8b107aa5ddacf031f285337e1cd24a0ac0c
2 files changed
+4
-3
Makefile.am
+1
@@ -642,6 +642,7 @@ if ENABLE_ACLK
642
netdata_LDADD = \
643
externaldeps/mosquitto/libmosquitto.a \
644
externaldeps/libwebsockets/libwebsockets.a \
645
+ $(OPTIONAL_LIBCAP_LIBS) \
646
$(NETDATA_COMMON_LIBS) \
647
$(NULL)
648
else
configure.ac
+3
-3
@@ -583,7 +583,7 @@ if test "$enable_cloud" != "no"; then
583
584
AC_MSG_CHECKING([if libwebsockets static lib is present])
585
if test -f "externaldeps/libwebsockets/libwebsockets.a"; then
586
- LWS_LIBS="-I externaldeps/libwebsockets/include"
586
+ LWS_CFLAGS="-I externaldeps/libwebsockets/include"
587
HAVE_libwebsockets_a="yes"
588
else
589
HAVE_libwebsockets_a="no"
@@ -596,7 +596,7 @@ if test "$enable_cloud" != "no"; then
596
AC_MSG_ERROR([agent-cloud-link can't be built without libcap. Disable it by --disable-cloud or enable libcap])
597
fi
598
if test "${with_libcap}" = "yes"; then
599
- LWS_LIBS+=" -lcap"
599
+ LWS_CFLAGS+=" ${LIBCAP_CFLAGS}"
600
fi
601
fi
602
@@ -1230,7 +1230,7 @@ AC_SUBST([webdir])
1230
1231
CFLAGS="${CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
1232
${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \
1233
- ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} ${OPTIONAL_MONGOC_CFLAGS} ${LWS_LIBS}"
1233
+ ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS}"
1234
1235
CXXFLAGS="${CFLAGS} ${CXX11FLAG}"
1236