From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Sep 2011 16:11:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.4-alpha~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b70a0a43750f6aabe800a83bcd7fdd6a5a14911b;p=thirdparty%2Ftor.git

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.
---

b70a0a43750f6aabe800a83bcd7fdd6a5a14911b
diff --cc configure.in
index f3640cb721,52ea094024..824547c6d7
--- 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