[or-cvs] [tor/master] The build stuff for tor-fw-helper means we need automake 1.6 or later

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Fri, 1 Oct 2010 00:01:08 -0400
Subject: The build stuff for tor-fw-helper means we need automake 1.6 or later
Commit: 92640aa57813c26e8f39b9336b8715505ca9a271

---
 Makefile.am               |    5 +++--
 changes/automake_required |    6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 changes/automake_required

diff --git a/Makefile.am b/Makefile.am
index b7b9737..5caae4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,9 @@
 # Copyright (c) 2007-2010, The Tor Project, Inc.
 # See LICENSE for licensing information
 
-AUTOMAKE_OPTIONS = foreign
- # else it keeps trying to put COPYING back in
+# "foreign" means we don't follow GNU package layout standards
+# 1.6 means we require automake vesion 1.6
+AUTOMAKE_OPTIONS = foreign 1.6
 
 SUBDIRS = src doc contrib
 
diff --git a/changes/automake_required b/changes/automake_required
new file mode 100644
index 0000000..bb50355
--- /dev/null
+++ b/changes/automake_required
@@ -0,0 +1,6 @@
+  o Build changes
+    - Our build system requires automake 1.6 or later to create the
+      Makefile.in files.  Previously, you could have used 1.4.
+      This only affects developers and people building Tor from git;
+      people who build Tor from the source distribution without changing
+      the Makefile.am files should be fine.
-- 
1.7.1