Commit 25fa2180 authored by cypherpunks's avatar cypherpunks Committed by Nick Mathewson
Browse files

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.
parent ef31c886
......@@ -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=
......
......@@ -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])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment