admin/netdata/patches/003-disable-optional-libraries-PR6658.patch

   1 From 893bfc98d3f33d02ce6d6a3a48fb02c964156fb5 Mon Sep 17 00:00:00 2001
   2 From: Markos Fountoulakis <markos.fountoulakis.senior@gmail.com>
   3 Date: Wed, 14 Aug 2019 11:55:50 +0300
   4 Subject: [PATCH] Stop configure.ac from linking against dbengine and https
   5  libraries when dbengine or https are disabled
   6
   7 ---
   8  configure.ac | 28 +++++++++++++---------------
   9  1 file changed, 13 insertions(+), 15 deletions(-)
  10
  11 diff --git a/configure.ac b/configure.ac
  12 index 56e484cc2c..8dbdcaa17f 100644
  13 --- a/configure.ac
  14 +++ b/configure.ac
  15 @@ -280,9 +280,6 @@ AC_CHECK_LIB(
  16      [UV_LIBS="-luv"]
  17  )
  18
  19 -OPTIONAL_UV_CFLAGS="${UV_CFLAGS}"
  20 -OPTIONAL_UV_LIBS="${UV_LIBS}"
  21 -
  22
  23  # -----------------------------------------------------------------------------
  24  # lz4 Extremely Fast Compression algorithm
  25 @@ -293,9 +290,6 @@ AC_CHECK_LIB(
  26      [LZ4_LIBS="-llz4"]
  27  )
  28
  29 -OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
  30 -OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
  31 -
  32
  33  # -----------------------------------------------------------------------------
  34  # Judy General purpose dynamic array
  35 @@ -306,9 +300,6 @@ AC_CHECK_LIB(
  36      [JUDY_LIBS="-lJudy"]
  37  )
  38
  39 -OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
  40 -OPTIONAL_JUDY_LIBS="${JUDY_LIBS}"
  41 -
  42
  43  # -----------------------------------------------------------------------------
  44  # zlib
  45 @@ -356,9 +347,6 @@ AC_CHECK_LIB(
  46      [SSL_LIBS="-lcrypto -lssl"]
  47  )
  48
  49 -OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
  50 -OPTIONAL_SSL_LIBS="${SSL_LIBS}"
  51 -
  52  # -----------------------------------------------------------------------------
  53  # JSON-C library
  54
  55 @@ -391,6 +379,14 @@ AC_MSG_CHECKING([if netdata dbengine should be used])
  56  if test "${enable_dbengine}" != "no" -a "${UV_LIBS}" -a "${LZ4_LIBS}" -a "${JUDY_LIBS}" -a "${SSL_LIBS}"; then
  57      enable_dbengine="yes"
  58      AC_DEFINE([ENABLE_DBENGINE], [1], [netdata dbengine usability])
  59 +    OPTIONAL_UV_CFLAGS="${UV_CFLAGS}"
  60 +    OPTIONAL_UV_LIBS="${UV_LIBS}"
  61 +    OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
  62 +    OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
  63 +    OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
  64 +    OPTIONAL_JUDY_LIBS="${JUDY_LIBS}"
  65 +    OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
  66 +    OPTIONAL_SSL_LIBS="${SSL_LIBS}"
  67  else
  68      enable_dbengine="no"
  69  fi
  70 @@ -399,10 +395,12 @@ AM_CONDITIONAL([ENABLE_DBENGINE], [test "${enable_dbengine}" = "yes"])
  71
  72  AC_MSG_CHECKING([if netdata https should be used])
  73  if test "${enable_https}" != "no" -a "${SSL_LIBS}"; then
  74 -       enable_https="yes"
  75 -       AC_DEFINE([ENABLE_HTTPS], [1], [netdata HTTPS usability])
  76 +    enable_https="yes"
  77 +    AC_DEFINE([ENABLE_HTTPS], [1], [netdata HTTPS usability])
  78 +    OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
  79 +    OPTIONAL_SSL_LIBS="${SSL_LIBS}"
  80  else
  81 -       enable_https="no"
  82 +    enable_https="no"
  83  fi
  84  AC_MSG_RESULT([${enable_https}])
  85  AM_CONDITIONAL([ENABLE_HTTPS], [test "${enable_https}" = "yes"])