diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-01 00:01:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-01 00:01:08 -0400 |
| commit | 92640aa57813c26e8f39b9336b8715505ca9a271 (patch) | |
| tree | 668d4e83268a5d5340b14099a88e9e93414fed7c | |
| parent | 1b2120654ce3aa34738ad33572eb15b9e220e435 (diff) | |
| download | tor-92640aa57813c26e8f39b9336b8715505ca9a271.tar.gz tor-92640aa57813c26e8f39b9336b8715505ca9a271.zip | |
The build stuff for tor-fw-helper means we need automake 1.6 or later
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | changes/automake_required | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b7b9737bd1..5caae4cdc6 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 0000000000..bb5035518f --- /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. |