[tor-commits] [tor/master] Move Automake options to configure.ac

[nickm at torproject.org]

commit 25fa21802f578db0e2852084a95a23b60ef1d1e9
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Fri Feb 26 12:53:28 2016 +0000

    Move Automake options to configure.ac
    
    This will centralize the version configuration in one file to simplify
    future changes.
    
    Also fixes some typos in the Automake options comments.
---
 Makefile.am  | 5 -----
 configure.ac | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bae506a..92ba2b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,6 @@
 # Copyright (c) 2007-2015, The Tor Project, Inc.
 # See LICENSE for licensing information
 
-# "foreign" means we don't follow GNU package layout standards
-# 1.11 means we require automake vesion 1.11
-# "subdir-objects" means put .o files in the same directory as the .c files
-AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects
-
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_LIBRARIES=
diff --git a/configure.ac b/configure.ac
index a4581e5..df4b9cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,12 @@ AC_PREREQ([2.63])
 AC_INIT([tor],[0.2.8.1-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+
+# "foreign" means we don't follow GNU package layout standards
+# "1.11" means we require automake version 1.11 or newer
+# "subdir-objects" means put .o files in the same directory as the .c files
+AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects])
+
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([orconfig.h])