Fixed another typo in the libJudy bundling code. (#9904)
* Fixed libJudy bundling code. There was a typo in the installer which was causing the configure script to not find the library. * Persist libJudy CFLAGS into build environment.
Austin S. Hemmelgarn committed
Sep 9, 2020 at 16:01 UTC
8f65a4f14e5b0b4d18a26d09eb9ee08f9da90051
2 files changed
+3
-2
configure.ac
+2
-1
@@ -1382,7 +1382,7 @@ AC_SUBST([webdir])
1382
CFLAGS="${CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
1383
${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \
1384
${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PUBSUB_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} \
1385
- ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS}"
1385
+ ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${OPTIONAL_JUDY_CFLAGS}"
1386
1387
CXXFLAGS="${CFLAGS} ${CXX11FLAG}"
1388
@@ -1402,6 +1402,7 @@ AC_SUBST([OPTIONAL_MATH_CFLAGS])
1402
AC_SUBST([OPTIONAL_MATH_LIBS])
1403
AC_SUBST([OPTIONAL_UV_LIBS])
1404
AC_SUBST([OPTIONAL_LZ4_LIBS])
1405
+AC_SUBST([OPTIONAL_JUDY_CFLAGS])
1406
AC_SUBST([OPTIONAL_JUDY_LIBS])
1407
AC_SUBST([OPTIONAL_SSL_LIBS])
1408
AC_SUBST([OPTIONAL_JSONC_LIBS])
netdata-installer.sh
+1
-1
@@ -700,7 +700,7 @@ build_judy() {
700
}
701
702
copy_judy() {
703
- target_dir="${PWD}/externaldeps/libjudy"
703
+ target_dir="${PWD}/externaldeps/libJudy"
704
705
run mkdir -p "${target_dir}" || return 1
706