From e4320689cc468be246264b3fba64e6fa95a74c19 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 3 Jan 2011 17:19:05 -0500 Subject: [PATCH] Note that Tor requires Automake 1.7. Fixes bug 2305 --- Makefile.am | 2 +- changes/bug2305 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changes/bug2305 diff --git a/Makefile.am b/Makefile.am index 4ded744fde..bcb81e64f2 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 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. + -- 2.11.4.GIT