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.

diff --git a/Makefile.am b/Makefile.am
index bae506ab0ff963fa093a4ddbb4c45ca8d7dd9c42..92ba2b868db0c7bdd16d19f0b855929379252723 100644 (file)
--- 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 a4581e54c3c452a209fe87ce3482c08b06f29145..df4b9cdc08ec5040a59d56d34dab9d1b5501b210 100644 (file)
--- 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])