Backport: Fix a variable handling mistake when testing for libevent functions in...

svn:r16794

diff --git a/ChangeLog b/ChangeLog
index d674255c675268eba3d2b6f01fa533786825b228..7172a51fbdc501a26d1a555c4e40c90afb658ec6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes in version 0.2.0.32 - 2008-??-??
+  o Minor bugfixes:
+    - Fix several infrequent memory leaks spotted by a static analysis
+      tool (XXX say which, if we're allowed).
+    - When testing for libevent functions, set the LDFLAGS variable
+      correctly.  (Found by Riastradh.)
+
+
 Changes in version 0.2.0.31 - 2008-09-03
   o Major bugfixes:
     - Make sure that two circuits can never exist on the same connection

diff --git a/configure.in b/configure.in
index 61d64436fc7d03c2c7208525e343ae5175a1e0f8..ccf1005483d20934c30012bfc29344b890b9e019 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -254,7 +254,7 @@ save_LIBS="$LIBS"
 save_LDFLAGS="$LDFLAGS"
 save_CPPFLAGS="$CPPFLAGS"
 LIBS="-levent $TOR_LIB_WS32 $LIBS"
-LDFLAGS="$TOR_LDFLAGS_libevent $LIBS"
+LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS"
 CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS"
 AC_CHECK_FUNCS(event_get_version event_get_method event_set_log_callback)
 LIBS="$save_LIBS"