Skip to content

Commit

Permalink
Fixed a bug when ./configure wasn't able to detect tor library (#1143)
Browse files Browse the repository at this point in the history
  • Loading branch information
psolstice authored Feb 19, 2022
1 parent 330cfc6 commit 9301a5d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [
Expand Down Expand Up @@ -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])
Expand Down

0 comments on commit 9301a5d

Please sign in to comment.