summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 70c1bd0..23f646c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,6 @@
include Make_global.am
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
man_MANS = conntrack.8 conntrackd.8
EXTRA_DIST = $(man_MANS) Make_global.am doc m4
diff --git a/configure.ac b/configure.ac
index 88faede..f840a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT(conntrack-tools, 0.9.15, pablo@netfilter.org)
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AM_PROG_LIBTOOL