summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-10-30 23:38:20 +0200
committerJan Engelhardt <jengelh@medozas.de>2010-10-30 23:59:24 +0200
commitd4fb1abd705b02767de88dd26783e15264422f70 (patch)
tree39cba91ecc96944376b9979aec805bf4e0a25174
parent45958eb88a8b4ddabb721187c7ddc15dd16232f9 (diff)
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>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 348cfc6..eb7d586 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
INCLUDES =$(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src utils
LINKOPTS = -lnfnetlink
diff --git a/configure.ac b/configure.ac
index e0e1a41..c9b39a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to create configure.
-AC_INIT
+AC_INIT([libnetfilter_log], [1.0.0])
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(libnetfilter_log, 1.0.0)
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AM_PROG_LIBTOOL