nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	Makefile.am
This commit is contained in:
Nick Mathewson 2011-01-03 17:25:30 -05:00
commit fd8f7991e4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -4,8 +4,8 @@
# See LICENSE for licensing information
# "foreign" means we don't follow GNU package layout standards
# 1.6 means we require automake vesion 1.6
AUTOMAKE_OPTIONS = foreign 1.6
# 1.7 means we require automake vesion 1.7
AUTOMAKE_OPTIONS = foreign 1.7
SUBDIRS = src doc contrib

5
changes/bug2305 Normal file
View File

@ -0,0 +1,5 @@
o Build changes
- Tor does not build packages correctly with Automake 1.6 and earlier;
added a check to Makefile.am to make sure that we're building with
Automake 1.7 or later.