From 9301a5da3ca9d343c1c953c519f967363cf046f1 Mon Sep 17 00:00:00 2001 From: psolstice Date: Sat, 19 Feb 2022 07:27:09 +0300 Subject: [PATCH] Fixed a bug when ./configure wasn't able to detect tor library (#1143) --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 4f03f35721..a4602656f6 100644 --- a/configure.ac +++ b/configure.ac @@ -455,8 +455,6 @@ case $host in ;; esac -AC_CHECK_LIB([tor], [tor_main], [AC_MSG_NOTICE([Tor found])], [AC_MSG_ERROR([Can't find Tor library])], [-lssl -lcrypto -levent -lz -pthread]) - if test x$use_pkgconfig = xyes; then m4_ifndef([PKG_PROG_PKG_CONFIG], [AC_MSG_ERROR(PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh.)]) m4_ifdef([PKG_PROG_PKG_CONFIG], [ @@ -982,6 +980,11 @@ dnl Check for libcap AC_CHECK_HEADERS([sys/capability.h]) AC_SEARCH_LIBS(cap_get_proc, [cap]) +dnl ============================================================ +dnl Check for libtor + +AC_CHECK_LIB([tor], [tor_main], [AC_MSG_NOTICE([Tor found])], [AC_MSG_ERROR([Can't find Tor library])], [-lssl -lcrypto -levent -lz -pthread]) + ac_configure_args="${ac_configure_args} --disable-shared" AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes])