aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/FindReadline.cmake4
-rw-r--r--src/common/util.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake
index 9ccef7ad8..5a8aa7b0a 100644
--- a/cmake/FindReadline.cmake
+++ b/cmake/FindReadline.cmake
@@ -64,3 +64,7 @@ main()
char * s = rl_copy_text(0, 0);
}
" GNU_READLINE_FOUND)
+
+if(NOT Readline_LIBRARY)
+ set(Readline_LIBRARY "")
+endif()
diff --git a/src/common/util.cpp b/src/common/util.cpp
index a13ac6e50..e8ac61815 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -550,7 +550,7 @@ std::string get_nix_version_display_string()
MCLOG_RED(el::Level::Warning, "global", "Running with glibc " << ver << ", hangs may occur - change glibc version if possible");
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_TEXT)
SSL_library_init();
#else
OPENSSL_init_ssl(0, NULL);