Stop configure.ac from linking against dbengine and https libraries when dbengine or https are disabled (#6658)
Markos Fountoulakis committed
Sep 3, 2019 at 14:23 UTC
5d113ada351f3d79893871ee4cc7bb21ed2e6b74
1 file changed
+13
-15
configure.ac
+13
-15
@@ -280,9 +280,6 @@ AC_CHECK_LIB(
280
[UV_LIBS="-luv"]
281
)
282
283
-OPTIONAL_UV_CFLAGS="${UV_CFLAGS}"
284
-OPTIONAL_UV_LIBS="${UV_LIBS}"
285
-
283
284
# -----------------------------------------------------------------------------
285
# lz4 Extremely Fast Compression algorithm
@@ -293,9 +290,6 @@ AC_CHECK_LIB(
290
[LZ4_LIBS="-llz4"]
291
)
292
296
-OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
297
-OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
298
-
293
294
# -----------------------------------------------------------------------------
295
# Judy General purpose dynamic array
@@ -306,9 +300,6 @@ AC_CHECK_LIB(
300
[JUDY_LIBS="-lJudy"]
301
)
302
309
-OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
310
-OPTIONAL_JUDY_LIBS="${JUDY_LIBS}"
311
-
303
304
# -----------------------------------------------------------------------------
305
# zlib
@@ -356,9 +347,6 @@ AC_CHECK_LIB(
347
[SSL_LIBS="-lcrypto -lssl"]
348
)
349
359
-OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
360
-OPTIONAL_SSL_LIBS="${SSL_LIBS}"
361
-
350
# -----------------------------------------------------------------------------
351
# JSON-C library
352
@@ -394,6 +382,14 @@ AC_MSG_CHECKING([if netdata dbengine should be used])
382
if test "${enable_dbengine}" != "no" -a "${UV_LIBS}" -a "${LZ4_LIBS}" -a "${JUDY_LIBS}" -a "${SSL_LIBS}"; then
383
enable_dbengine="yes"
384
AC_DEFINE([ENABLE_DBENGINE], [1], [netdata dbengine usability])
385
+ OPTIONAL_UV_CFLAGS="${UV_CFLAGS}"
386
+ OPTIONAL_UV_LIBS="${UV_LIBS}"
387
+ OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
388
+ OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
389
+ OPTIONAL_JUDY_CFLAGS="${JUDY_CFLAGS}"
390
+ OPTIONAL_JUDY_LIBS="${JUDY_LIBS}"
391
+ OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
392
+ OPTIONAL_SSL_LIBS="${SSL_LIBS}"
393
else
394
enable_dbengine="no"
395
fi
@@ -402,10 +398,12 @@ AM_CONDITIONAL([ENABLE_DBENGINE], [test "${enable_dbengine}" = "yes"])
398
399
AC_MSG_CHECKING([if netdata https should be used])
400
if test "${enable_https}" != "no" -a "${SSL_LIBS}"; then
405
- enable_https="yes"
406
- AC_DEFINE([ENABLE_HTTPS], [1], [netdata HTTPS usability])
401
+ enable_https="yes"
402
+ AC_DEFINE([ENABLE_HTTPS], [1], [netdata HTTPS usability])
403
+ OPTIONAL_SSL_CFLAGS="${SSL_CFLAGS}"
404
+ OPTIONAL_SSL_LIBS="${SSL_LIBS}"
405
else
408
- enable_https="no"
406
+ enable_https="no"
407
fi
408
AC_MSG_RESULT([${enable_https}])
409
AM_CONDITIONAL([ENABLE_HTTPS], [test "${enable_https}" = "yes"])