build: move automake options into AM_INIT_AUTOMAKE call

diff --git a/Makefile.am b/Makefile.am
index 962c14cacb912239b574ff4b890da434c3d895e0..b66b42c25301237f4396abee7f4f654f94ff8181 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@
 #
 # See LICENSE for copying information.
 
-# 'foreign' means that we're not enforcing GNU package rules strictly.
-# '1.13' means that we need automake 1.13 or later (and we do).
-AUTOMAKE_OPTIONS = foreign 1.13 subdir-objects
-
 ACLOCAL_AMFLAGS = -I m4
 
 # This is the "Release" of the Libevent ABI.  It takes precedence over

diff --git a/configure.ac b/configure.ac
index 9e62bc0421ee43b3b099b60637d75cb9b6cb5c8a..811ab9ee875b6c71dd57b122895367c27edb3904 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,14 @@ AC_CONFIG_SRCDIR(event.c)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
-dnl AM_SILENT_RULES req. automake 1.11.  [no] defaults V=1
+
+dnl Automake setup
+dnl 'foreign' means that GNU package rules are not strictly enforced.
+AM_INIT_AUTOMAKE([1.13 foreign subdir-objects])
+
+dnl make compilation quiet unless V=1 is used
 AM_SILENT_RULES([yes])
+
 AC_CONFIG_HEADERS(config.h  evconfig-private.h:evconfig-private.h.in)
 AC_DEFINE(NUMERIC_VERSION, 0x02020001, [Numeric representation of the version])