diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 17:24:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 17:24:32 -0500 |
| commit | 0e9d7f105d217e88b87058fabb31c94e4f72762c (patch) | |
| tree | 415cab7270b4128e08a07dd2c920cd4a6fb5d003 | |
| parent | f089804332c0289159ec432d8ce82bb1ed6316aa (diff) | |
| parent | e4320689cc468be246264b3fba64e6fa95a74c19 (diff) | |
| download | tor-0e9d7f105d217e88b87058fabb31c94e4f72762c.tar.gz tor-0e9d7f105d217e88b87058fabb31c94e4f72762c.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug2305 | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index eb61de7ff0..5f15926183 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ # Copyright (c) 2007-2011, The Tor Project, Inc. # See LICENSE for licensing information -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.7 # else it keeps trying to put COPYING back in SUBDIRS = src doc contrib diff --git a/changes/bug2305 b/changes/bug2305 new file mode 100644 index 0000000000..c979d5fd3a --- /dev/null +++ b/changes/bug2305 @@ -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. + |