diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-12-08 09:15:06 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-12-08 09:15:06 -0500 |
| commit | 2d0a7f2e8922fd47e0fe613ea08dcf1ce3840e73 (patch) | |
| tree | dcfd3d82ca213d3e6b55c14e894c038a0f4e09e8 /configure.ac | |
| parent | a09eb66cc73b33dc81cba0258586033fb58904bf (diff) | |
| parent | c618c4f27986825df2026fb22b8ee222edd1afa1 (diff) | |
| download | tor-2d0a7f2e8922fd47e0fe613ea08dcf1ce3840e73.tar.gz tor-2d0a7f2e8922fd47e0fe613ea08dcf1ce3840e73.zip | |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4c7471761e..285fef1696 100644 --- a/configure.ac +++ b/configure.ac @@ -131,8 +131,9 @@ if test "$enable_static_tor" = "yes"; then enable_static_libevent="yes"; enable_static_openssl="yes"; enable_static_zlib="yes"; - CFLAGS="$CFLAGS -static" + TOR_STATIC_LDFLAGS="-static" fi +AC_SUBST(TOR_STATIC_LDFLAGS) if test "$enable_system_torrc" = "no"; then AC_DEFINE(DISABLE_SYSTEM_TORRC, 1, @@ -966,7 +967,7 @@ if test "$enable_static_libevent" = "yes"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent") else - TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/.libs/libevent.a $STATIC_LIBEVENT_FLAGS" fi else if test "x$ac_cv_header_event2_event_h" = "xyes"; then |