|
@@ -410,7 +410,6 @@ if test "$enable_static_libevent" = "yes"; then
|
|
|
else
|
|
|
TOR_LIBEVENT_LIBS="-levent"
|
|
|
fi
|
|
|
-AC_SUBST(TOR_LIBEVENT_LIBS)
|
|
|
|
|
|
dnl This isn't the best test for Libevent 2.0.3-alpha. Once it's released,
|
|
|
dnl we can do much better.
|
|
@@ -458,8 +457,14 @@ CPPFLAGS="$save_CPPFLAGS"
|
|
|
|
|
|
AM_CONDITIONAL(USE_BUFFEREVENTS, test "$enable_bufferevents" = "yes")
|
|
|
if test "$enable_bufferevents" = "yes"; then
|
|
|
- AC_DEFINE(USE_BUFFEREVENTS, 1, [Defined if we're going to use Libevent's buffered IO API])
|
|
|
+ AC_DEFINE(USE_BUFFEREVENTS, 1, [Defined if we're going to use Libevent's buffered IO API])
|
|
|
+ if test "$enable_static_libevent" = "yes"; then
|
|
|
+ TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS"
|
|
|
+ else
|
|
|
+ TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS"
|
|
|
+ fi
|
|
|
fi
|
|
|
+AC_SUBST(TOR_LIBEVENT_LIBS)
|
|
|
|
|
|
dnl ------------------------------------------------------
|
|
|
dnl Where do you live, openssl? And how do we call you?
|