commit b70a0a43750f6aabe800a83bcd7fdd6a5a14911b Merge: 947012e 5f9cdee Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 7 12:11:35 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts: configure.in

Conflict was between two pieces of configure.in logic added to the same place. Trivial.

changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-)

diff --cc configure.in index f3640cb,52ea094..824547c --- a/configure.in +++ b/configure.in @@@ -145,9 -118,12 +145,15 @@@ if test "$enable_local_appdata" = "yes" [Defined if we default to host local appdata paths on Windows]) fi

+AC_ARG_ENABLE(bufferevents, + AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) + + dnl check for the correct "ar" when cross-compiling + AN_MAKEVAR([AR], [AC_PROG_AR]) + AN_PROGRAM([ar], [AC_PROG_AR]) + AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) + AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET