Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jarl
tor
Commits
b62abf9f
Commit
b62abf9f
authored
14 years ago
by
Jacob Appelbaum
Committed by
Sebastian Hahn
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix libevent autoconf bug #2698
parent
fe86be61
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/bug2698
+3
-0
3 additions, 0 deletions
changes/bug2698
configure.in
+17
-3
17 additions, 3 deletions
configure.in
with
20 additions
and
3 deletions
changes/bug2698
0 → 100644
+
3
−
0
View file @
b62abf9f
o Minor build issues
- We incorrectly linked libevent when configured with
--enable-static-libevent. Fixes bug 2698.
This diff is collapsed.
Click to expand it.
configure.in
+
17
−
3
View file @
b62abf9f
...
...
@@ -271,7 +271,21 @@ tor_libevent_pkg_debian="libevent-dev"
tor_libevent_devpkg_redhat="libevent-devel"
tor_libevent_devpkg_debian="libevent-dev"
TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [
dnl On Gnu/Linux or any place we require it, we'll add librt to the Libevent
dnl linking for static builds.
STATIC_LIBEVENT_FLAGS=""
if test "$enable_static_libevent" = "yes"; then
dnl Determine if we have clock_gettime in librt
AC_SEARCH_LIBS([clock_gettime], [rt],
[have_rt=yes])
if test "$have_rt" = yes; then
STATIC_LIBEVENT_FLAGS=" -lrt "
else
STATIC_LIBEVENT_FLAGS=""
fi
fi
TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32], [
#ifdef WIN32
#include <winsock2.h>
#endif
...
...
@@ -294,7 +308,7 @@ dnl Now check for particular libevent functions.
save_LIBS="$LIBS"
save_LDFLAGS="$LDFLAGS"
save_CPPFLAGS="$CPPFLAGS"
LIBS="-levent $TOR_LIB_WS32 $LIBS"
LIBS="-levent
$STATIC_LIBEVENT_FLAGS
$TOR_LIB_WS32 $LIBS"
LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS"
CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS"
AC_CHECK_FUNCS(event_get_version event_get_version_number event_get_method event_set_log_callback evdns_set_outgoing_bind_address event_base_loopexit)
...
...
@@ -315,7 +329,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"
TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a
$STATIC_LIBEVENT_FLAGS
"
fi
else
TOR_LIBEVENT_LIBS="-levent"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment