diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:29:11 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:29:27 +0200 |
| commit | 1050f99bb5af5047cf60b7a57ef9f8357e305f9b (patch) | |
| tree | 8022d477dc124da6432f32726005125979665ddd | |
| parent | 0ff350813d7e4bba17bd3c1849149efe90dfd7f7 (diff) | |
| download | conntrack-tools-1050f99bb5af5047cf60b7a57ef9f8357e305f9b.tar.gz conntrack-tools-1050f99bb5af5047cf60b7a57ef9f8357e305f9b.zip | |
build: use modern call syntax for 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.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
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 |