diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-05-06 15:34:00 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-05-06 15:38:32 +0200 |
| commit | e36f9d1d9beec0daed57b68f936293dccc77b171 (patch) | |
| tree | 42fbeb70c242f04665e2f35f49ccb773ea667219 /configure.in | |
| parent | a740994c771b5a4ecfba6a9f6f6fc57758a4b9f8 (diff) | |
| download | tor-e36f9d1d9beec0daed57b68f936293dccc77b171.tar.gz tor-e36f9d1d9beec0daed57b68f936293dccc77b171.zip | |
Link to libevent_openssl statically when requested
When configure tor with --enable-bufferevents and
--enable-static-libevent, libevent_openssl would still be linked
dynamically. Fix this and refactor src/or/Makefile.am along the way.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 58d32a1815..26c933b156 100644 --- a/configure.in +++ b/configure.in @@ -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? |