Browse Source

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 4 years ago
parent
commit
8f65a4f14e
2 changed files with 3 additions and 2 deletions
  1. 2 1
      configure.ac
  2. 1 1
      netdata-installer.sh

+ 2 - 1
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])

+ 1 - 1
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