From: Sebastian Hahn <sebastian@torproject.org>
Date: Sun, 27 Mar 2011 03:35:17 +0000 (+0200)
Subject: Small tweaks for bug2698 bugfix
X-Git-Tag: tor-0.2.3.1-alpha~62^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47621188328c19be18a6915f937e4e0f7e04fba8;p=thirdparty%2Ftor.git

Small tweaks for bug2698 bugfix
---

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