diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-09-09 16:01:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 16:01:13 -0400 |
| commit | 8f65a4f14e5b0b4d18a26d09eb9ee08f9da90051 (patch) | |
| tree | 2122ab6302e849ab6628062876a57b859cd21d0f | |
| parent | 10728c2e6e6d96c077716e5cf222d6fc408319cd (diff) | |
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.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | netdata-installer.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 239e961b51..800664de47 100644 --- a/configure.ac +++ b/configure.ac @@ -1382,7 +1382,7 @@ AC_SUBST([webdir]) CFLAGS="${CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \ ${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \ ${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PUBSUB_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} \ - ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS}" + ${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${OPTIONAL_JUDY_CFLAGS}" CXXFLAGS="${CFLAGS} ${CXX11FLAG}" @@ -1402,6 +1402,7 @@ AC_SUBST([OPTIONAL_MATH_CFLAGS]) AC_SUBST([OPTIONAL_MATH_LIBS]) AC_SUBST([OPTIONAL_UV_LIBS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_JUDY_CFLAGS]) AC_SUBST([OPTIONAL_JUDY_LIBS]) AC_SUBST([OPTIONAL_SSL_LIBS]) AC_SUBST([OPTIONAL_JSONC_LIBS]) diff --git a/netdata-installer.sh b/netdata-installer.sh index 72e84198f8..5458179639 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -700,7 +700,7 @@ build_judy() { } copy_judy() { - target_dir="${PWD}/externaldeps/libjudy" + target_dir="${PWD}/externaldeps/libJudy" run mkdir -p "${target_dir}" || return 1 |