diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-09-12 10:55:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-09-12 10:55:06 +0200 |
| commit | 59dd4d852015a8c2e0e325d5e6e792f2b1ec5cd8 (patch) | |
| tree | b06d4ba96414015aef1e68b5d8cebe6cb472278a | |
| parent | a34338bd85b80464e276d0a12865880f663dc83e (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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 80294cc..3878a8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/Make_global.am -AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = include src utils qa diff --git a/configure.ac b/configure.ac index ae61ba0..eda4c14 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Process this file with autoconf to create configure. -AC_INIT +AC_INIT([libnetfilter_conntrack], [0.9.0]) AC_CANONICAL_SYSTEM AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.9.0) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6]) AC_PROG_CC AM_PROG_LIBTOOL |