build: move global automake options into configure.ac

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Makefile.am b/Makefile.am
index 5965387d33401b3868b074c5f9ae8a5df1add9a5..cf74fca5f663da0fdc56fe7f5b1eb5569cb95336 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 
 ACLOCAL_AMFLAGS  = -I m4
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = ulogd.8
 

diff --git a/configure.ac b/configure.ac
index e5a64fec88a14257de81609bf0942f64b2dba0ee..370b4b3ec0b549a670a481787d120d707b02fadc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.50])
 AC_INIT([ulogd], [2.0.0beta4])
 
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.6])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])