nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	configure.in

Conflict was between two pieces of configure.in logic added to the
same place.  Trivial.
This commit is contained in:
Nick Mathewson 2011-09-07 12:11:35 -04:00
commit b70a0a4375
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug3909 Normal file
View File

@ -0,0 +1,3 @@
o Build fixes:
- Search for a platform-specific version of "ar" when cross-compiling.
Should fix builds on iOS. Found by Marco Bonetti.

6
configure.in
View File

@ -148,6 +148,12 @@ fi
AC_ARG_ENABLE(bufferevents, AC_ARG_ENABLE(bufferevents,
AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) 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_CC
AC_PROG_CPP AC_PROG_CPP
AC_PROG_MAKE_SET AC_PROG_MAKE_SET