aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-09-08 01:57:02 +0000
committerNick Mathewson <nickm@torproject.org>2008-09-08 01:57:02 +0000
commit67327a863a944b628b6ab26bd1709416790c9f91 (patch)
tree986599c873ec3c1d12919c1e43abf6094442d8cf
parentbaeb260ad18842118f3574ab7ad73fb78c6a4b43 (diff)
downloadtor-67327a863a944b628b6ab26bd1709416790c9f91.tar
tor-67327a863a944b628b6ab26bd1709416790c9f91.tar.gz
Fix a variable handling mistake when testing for libevent functions in configure.in. Found by Riastradh.
svn:r16793
-rw-r--r--ChangeLog2
-rw-r--r--configure.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 77170aadb..c102a2305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
- Fixed some memory leaks --some quite frequent, some almost impossible
to trigger-- based on results of a static analysis tool. (XXX Can we
say which? -NM)
+ - When testing for libevent functions, set the LDFLAGS variable
+ correctly. (Found by Riastradh.)
o Minor features:
- Use a lockfile to make sure that two Tor processes are not
diff --git a/configure.in b/configure.in
index f765e8e7f..134b7abd4 100644
--- a/configure.in
+++ b/configure.in
@@ -268,7 +268,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"