build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE

automake options also need to definitely go into configure.ac, otherwise
they only apply to a single directory.

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

diff --git a/Makefile.am b/Makefile.am
index 28641f8624d0a76e8affd5bd11d020980cbe252f..b4e604b25d2a9ef16271f0965673ae34ff0716b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = $(man_MANS) 

diff --git a/configure.ac b/configure.ac
index a82c9f1c3b19bfcd47c45bd242a3eea87ed5e36a..3bd3e1c99e1fe06883073cc97262679e243cedba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to create configure.
 
-AC_INIT
+AC_INIT([libnetfilter_queue], [1.0.0])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE(libnetfilter_queue, 1.0.0)
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
 
 AC_PROG_CC
 AC_EXEEXT