aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-03 17:19:05 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-03 17:24:16 -0500
commite4320689cc468be246264b3fba64e6fa95a74c19 (patch)
tree174b2eb24121bdef29a6feed2c8a7cb3d6990887
parente365aee97110c6c6df6f56ca9814d88c3808a2d1 (diff)
downloadtor-e4320689cc468be246264b3fba64e6fa95a74c19.tar
tor-e4320689cc468be246264b3fba64e6fa95a74c19.tar.gz
Note that Tor requires Automake 1.7. Fixes bug 2305
-rw-r--r--Makefile.am2
-rw-r--r--changes/bug23055
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 4ded744fd..bcb81e64f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,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 000000000..c979d5fd3
--- /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.
+