[tor-commits] [tor/maint-0.2.2] Small tweaks for bug2698 bugfix

[nickm at torproject.org]

commit 47621188328c19be18a6915f937e4e0f7e04fba8
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sun Mar 27 05:35:17 2011 +0200

    Small tweaks for bug2698 bugfix
---
 changes/bug2698 |    9 ++++++---
 configure.in    |    2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changes/bug2698 b/changes/bug2698
index 3c2468f..d995788 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 bd94174..6ed43ce 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