summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-03-27 05:35:17 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-03-27 05:38:53 +0200
commit47621188328c19be18a6915f937e4e0f7e04fba8 (patch)
treed77eb58d8d9bea6060e6601393bbf179c6d02709
parentb62abf9f21499abda5b703271d5663a2a7380ca0 (diff)
downloadtor-47621188328c19be18a6915f937e4e0f7e04fba8.tar.gz
tor-47621188328c19be18a6915f937e4e0f7e04fba8.zip
Small tweaks for bug2698 bugfix
-rw-r--r--changes/bug26989
-rw-r--r--configure.in2
2 files changed, 6 insertions, 5 deletions
diff --git a/changes/bug2698 b/changes/bug2698
index 3c2468f5e8..d995788bfc 100644
--- a/changes/bug2698
+++ b/changes/bug2698
@@ -1,3 +1,6 @@
- o Minor build issues
- - We incorrectly linked libevent when configured with
- --enable-static-libevent. Fixes bug 2698.
+ o Minor bugfixes:
+ - Fix an issue that prevented static linking of libevent on
+ some platforms (notably Linux). Fixes bug 2698, bugfix on
+ versions 0.2.1.23/0.2.2.8-alpha (the versions introducing
+ the --with-static-libevent configure option).
+
diff --git a/configure.in b/configure.in
index bd94174252..6ed43ce23b 100644
--- a/configure.in
+++ b/configure.in
@@ -280,8 +280,6 @@ if test "$enable_static_libevent" = "yes"; then
[have_rt=yes])
if test "$have_rt" = yes; then
STATIC_LIBEVENT_FLAGS=" -lrt "
- else
- STATIC_LIBEVENT_FLAGS=""
fi
fi