summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-09-08 01:57:17 +0000
committerNick Mathewson <nickm@torproject.org>2008-09-08 01:57:17 +0000
commitafba08482fd477db56af6d890033b6a5de0b846b (patch)
tree9713feca6d15c7900c392812661b59537ba94cba
parent066104e85353bd6eb11ba615b2dd03a2ace190a8 (diff)
downloadtor-afba08482fd477db56af6d890033b6a5de0b846b.tar.gz
tor-afba08482fd477db56af6d890033b6a5de0b846b.zip
Backport: Fix a variable handling mistake when testing for libevent functions in configure.in. Found by Riastradh.
svn:r16794
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d674255c67..7172a51fbd 100644
--- 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 61d64436fc..ccf1005483 100644
--- 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"