|
Lines 1-7
Link Here
|
| 1 |
--- configure.ac.orig 2018-11-02 14:04:52 UTC |
1 |
--- configure.ac.orig 2020-05-30 00:15:05 UTC |
| 2 |
+++ configure.ac |
2 |
+++ configure.ac |
| 3 |
@@ -497,15 +497,15 @@ AC_MSG_RESULT([${enable_lto}]) |
3 |
@@ -380,6 +380,34 @@ PKG_CHECK_MODULES([JSON],[json-c],AC_CHECK_LIB( |
|
|
4 |
OPTIONAL_JSONC_LIBS="${JSONC_LIBS}" |
| 4 |
|
5 |
|
|
|
6 |
# ----------------------------------------------------------------------------- |
| 7 |
+# mosquitto library |
| 8 |
+ |
| 9 |
+PKG_CHECK_MODULES([MOSQUITTO],[mosquitto],AC_CHECK_LIB( |
| 10 |
+ [mosquitto], |
| 11 |
+ [mosquitto_connect], |
| 12 |
+ [MOSQUITTO_LIBS="-lmosquitto"]),AC_CHECK_LIB( |
| 13 |
+ [mosquitto], |
| 14 |
+ [mosquitto_connect], |
| 15 |
+ [MOSQUITTO_LIBS="-lmosquitto"]) |
| 16 |
+ ) |
| 17 |
+ |
| 18 |
+OPTIONAL_MOSQUITTO_LIBS="${MOSQUITTO_LIBS}" |
| 19 |
+ |
| 20 |
+# ----------------------------------------------------------------------------- |
| 21 |
+# websockets library |
| 22 |
+ |
| 23 |
+PKG_CHECK_MODULES([WEBSOCKETS],[websockets],AC_CHECK_LIB( |
| 24 |
+ [websockets], |
| 25 |
+ [lws_set_socks], |
| 26 |
+ [WEBSOCKETS_LIBS="-lwebsockets"]),AC_CHECK_LIB( |
| 27 |
+ [websockets], |
| 28 |
+ [lws_get_vhost_by_name], |
| 29 |
+ [WEBSOCKETS_LIBS="-lwebsockets"]) |
| 30 |
+ ) |
| 31 |
+ |
| 32 |
+OPTIONAL_WEBSOCKETS_LIBS="${WEBSOCKETS_LIBS}" |
| 33 |
+ |
| 34 |
+# ----------------------------------------------------------------------------- |
| 35 |
# VFS plugin libs |
| 36 |
|
| 37 |
AC_CHECK_LIB( |
| 38 |
@@ -457,7 +485,7 @@ if test "${enable_jsonc}" != "no" -a -z "${JSONC_LIBS} |
| 39 |
if test "${HAVE_libjson_c_a}" = "yes"; then |
| 40 |
AC_DEFINE([LINK_STATIC_JSONC], [1], [static json-c should be used]) |
| 41 |
JSONC_LIBS="static" |
| 42 |
- OPTIONAL_JSONC_STATIC_CFLAGS="-I externaldeps/jsonc" |
| 43 |
+ OPTIONAL_JSONC_CFLAGS="-I externaldeps/jsonc" |
| 44 |
fi |
| 45 |
AC_MSG_RESULT([${HAVE_libjson_c_a}]) |
| 46 |
fi |
| 47 |
@@ -577,40 +605,54 @@ if test "$enable_cloud" != "no"; then |
| 48 |
AC_MSG_WARN([OpenSSL required for agent-cloud-link but not found. Try installing 'libssl-dev' or 'openssl-devel'.]) |
| 49 |
fi |
| 50 |
|
| 51 |
- AC_MSG_CHECKING([if libmosquitto static lib is present (and builds)]) |
| 52 |
- if test -f "externaldeps/mosquitto/libmosquitto.a"; then |
| 53 |
- LIBS_BKP="${LIBS}" |
| 54 |
- LIBS="externaldeps/mosquitto/libmosquitto.a ${OPTIONAL_SSL_LIBS}" |
| 55 |
- AC_LINK_IFELSE([AC_LANG_SOURCE([[#include "externaldeps/mosquitto/mosquitto.h" |
| 56 |
- int main (int argc, char **argv) { |
| 57 |
- int m,mm,r; |
| 58 |
- mosquitto_lib_version(&m, &mm, &r); |
| 59 |
- }]])], |
| 60 |
- [HAVE_libmosquitto_a="yes"], |
| 61 |
- [HAVE_libmosquitto_a="no"]) |
| 62 |
- LIBS="${LIBS_BKP}" |
| 63 |
- else |
| 64 |
- HAVE_libmosquitto_a="no" |
| 65 |
- AC_DEFINE([ACLK_NO_LIBMOSQ], [1], [Libmosquitto.a was not found during build.]) |
| 66 |
+ if test -z "${MOSQUITTO_LIBS}"; then |
| 67 |
+ AC_MSG_CHECKING([if libmosquitto static lib is present (and builds)]) |
| 68 |
+ if test -f "externaldeps/mosquitto/libmosquitto.a"; then |
| 69 |
+ LIBS_BKP="${LIBS}" |
| 70 |
+ LIBS="externaldeps/mosquitto/libmosquitto.a ${OPTIONAL_SSL_LIBS}" |
| 71 |
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[#include "externaldeps/mosquitto/mosquitto.h" |
| 72 |
+ int main (int argc, char **argv) { |
| 73 |
+ int m,mm,r; |
| 74 |
+ mosquitto_lib_version(&m, &mm, &r); |
| 75 |
+ }]])], |
| 76 |
+ [HAVE_libmosquitto_a="yes"], |
| 77 |
+ [HAVE_libmosquitto_a="no"]) |
| 78 |
+ LIBS="${LIBS_BKP}" |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
+ if test "${HAVE_libmosquitto_a}" = "yes"; then |
| 82 |
+ AC_DEFINE([LINK_STATIC_MOSQUITTO], [1], [static mosquitto should be used]) |
| 83 |
+ MOSQUITTO_LIBS="static" |
| 84 |
+ OPTIONAL_MOSQUITTO_LIBS="externaldeps/mosquitto/libmosquitto.a" |
| 85 |
+ OPTIONAL_MOSQUITTO_CFLAGS="-I externaldeps/mosquitto" |
| 86 |
+ fi |
| 87 |
+ AC_MSG_RESULT([${HAVE_libmosquitto_a}]) |
| 88 |
+ #AC_DEFINE([ACLK_NO_LIBMOSQ], [1], [Libmosquitto.a was not found during build.]) |
| 89 |
fi |
| 90 |
- AC_MSG_RESULT([${HAVE_libmosquitto_a}]) |
| 91 |
+ AM_CONDITIONAL([LINK_STATIC_MOSQUITTO], [test "${MOSQUITTO_LIBS}" = "static"]) |
| 92 |
|
| 93 |
- AC_MSG_CHECKING([if libwebsockets static lib is present]) |
| 94 |
- if test -f "externaldeps/libwebsockets/libwebsockets.a"; then |
| 95 |
- LWS_CFLAGS="-I externaldeps/libwebsockets/include" |
| 96 |
- HAVE_libwebsockets_a="yes" |
| 97 |
- else |
| 98 |
- HAVE_libwebsockets_a="no" |
| 99 |
- AC_DEFINE([ACLK_NO_LWS], [1], [libwebsockets.a was not found during build.]) |
| 100 |
+ if test -z "${MOSQUITTO_LIBS}"; then |
| 101 |
+ AC_MSG_CHECKING([if libwebsockets static lib is present]) |
| 102 |
+ if test -f "externaldeps/libwebsockets/libwebsockets.a"; then |
| 103 |
+ OPTIONAL_MOSQUITTO_LIBS="externaldeps/libwebsockets/libwebsockets.a" |
| 104 |
+ OPTIONAL_WEBSOCKETS_CFLAGS="-I externaldeps/libwebsockets/include" |
| 105 |
+ AC_DEFINE([LINK_STATIC_WEBSOCKETS], [1], [static websockets should be used]) |
| 106 |
+ WEBSOCKETS_LIBS="static" |
| 107 |
+ HAVE_libwebsockets_a="yes" |
| 108 |
+ else |
| 109 |
+ HAVE_libwebsockets_a="no" |
| 110 |
+ AC_DEFINE([ACLK_NO_LWS], [1], [libwebsockets.a was not found during build.]) |
| 111 |
+ fi |
| 112 |
+ AC_MSG_RESULT([${HAVE_libwebsockets_a}]) |
| 113 |
fi |
| 114 |
- AC_MSG_RESULT([${HAVE_libwebsockets_a}]) |
| 115 |
+ AM_CONDITIONAL([LINK_STATIC_WEBSOCKETS], [test "${WEBSOCKETS_LIBS}" = "static"]) |
| 116 |
|
| 117 |
if test "${build_target}" = "linux" -a "${enable_cloud}" != "no"; then |
| 118 |
if test "${have_libcap}" = "yes" -a "${with_libcap}" = "no"; then |
| 119 |
AC_MSG_ERROR([agent-cloud-link can't be built without libcap. Disable it by --disable-cloud or enable libcap]) |
| 120 |
fi |
| 121 |
if test "${with_libcap}" = "yes"; then |
| 122 |
- LWS_CFLAGS+=" ${LIBCAP_CFLAGS}" |
| 123 |
+ OPTIONAL_WEBSOCKETS_CFLAGS+=" ${LIBCAP_CFLAGS}" |
| 124 |
fi |
| 125 |
fi |
| 126 |
|
| 127 |
@@ -622,7 +664,7 @@ if test "$enable_cloud" != "no"; then |
| 128 |
AC_MSG_ERROR([You have asked for ACLK to be built but no json-c available. ACLK requires json-c]) |
| 129 |
|
| 130 |
AC_MSG_CHECKING([if netdata agent-cloud-link can be enabled]) |
| 131 |
- if test "${HAVE_libmosquitto_a}" = "yes" -a "${HAVE_libwebsockets_a}" = "yes" -a -n "${SSL_LIBS}" -a "${enable_jsonc}" = "yes"; then |
| 132 |
+ if test "${enable_jsonc}" = "yes" -a -n "${MOSQUITTO_LIBS}" -a -n "${WEBSOCKETS_LIBS}" -a -n "${SSL_LIBS}"; then |
| 133 |
can_enable_aclk="yes" |
| 134 |
else |
| 135 |
can_enable_aclk="no" |
| 136 |
@@ -1227,15 +1269,15 @@ AM_CONDITIONAL([ENABLE_CXX_LINKER], [test "${enable_ba |
| 137 |
|
| 5 |
AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged]) |
138 |
AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged]) |
| 6 |
|
139 |
|
| 7 |
-varlibdir="${localstatedir}/lib/netdata" |
140 |
-varlibdir="${localstatedir}/lib/netdata" |
|
Lines 21-23
Link Here
|
| 21 |
pluginsdir="${libexecdir}/netdata/plugins.d" |
154 |
pluginsdir="${libexecdir}/netdata/plugins.d" |
| 22 |
|
155 |
|
| 23 |
AC_SUBST([build_target]) |
156 |
AC_SUBST([build_target]) |
|
|
157 |
@@ -1253,8 +1295,8 @@ AC_SUBST([webdir]) |
| 158 |
|
| 159 |
CFLAGS="${CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \ |
| 160 |
${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \ |
| 161 |
- ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} \ |
| 162 |
- ${OPTIONAL_JSONC_STATIC_CFLAGS}" |
| 163 |
+ ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} ${OPTIONAL_MONGOC_CFLAGS} \ |
| 164 |
+ ${OPTIONAL_WEBSOCKETS_CFLAGS} ${OPTIONAL_JSONC_CFLAGS} $(OPTIONAL_MOSQUITTO_CFLAGS)" |
| 165 |
|
| 166 |
CXXFLAGS="${CFLAGS} ${CXX11FLAG}" |
| 167 |
|
| 168 |
@@ -1278,6 +1320,8 @@ AC_SUBST([OPTIONAL_JUDY_LIBS]) |
| 169 |
AC_SUBST([OPTIONAL_SSL_LIBS]) |
| 170 |
AC_SUBST([OPTIONAL_EBPF_LIBS]) |
| 171 |
AC_SUBST([OPTIONAL_JSONC_LIBS]) |
| 172 |
+AC_SUBST([OPTIONAL_MOSQUITTO_LIBS]) |
| 173 |
+AC_SUBST([OPTIONAL_WEBSOCKETS_LIBS]) |
| 174 |
AC_SUBST([OPTIONAL_NFACCT_CFLAGS]) |
| 175 |
AC_SUBST([OPTIONAL_NFACCT_LIBS]) |
| 176 |
AC_SUBST([OPTIONAL_ZLIB_CFLAGS]) |