diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-01-07 15:11:59 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-01-07 15:11:59 +0100 |
commit | 0086b8bf9cf74642f6d6d82d9bbaedc80fec1dca (patch) | |
tree | 9e99c8ac4c288cf37d8bb89c9dc87cdd0774e601 | |
parent | 8783071f70e0d9351cde8bfe5f9360e831388415 (diff) |
build: resolve autotools suggestions
libtool2 wants to put files into m4, so let it have it.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | m4/.gitignore | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 5465db6c..ced23b37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ # -*- Makefile -*- +ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign subdir-objects AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS} diff --git a/configure.ac b/configure.ac index 39fa0ec8..8c9c30de 100644 --- a/configure.ac +++ b/configure.ac @@ -7,12 +7,13 @@ define([_XTABLES_VERSION],_XTABLES_VERSION_MAJOR._XTABLES_VERSION_MINOR._XTABLES AC_INIT([iptables], _XTABLES_VERSION) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_INSTALL -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wall]) AC_PROG_CC AM_PROG_CC_C_O AC_DISABLE_STATIC -AC_PROG_LIBTOOL +AM_PROG_LIBTOOL AC_ARG_WITH([kernel], AS_HELP_STRING([--with-kernel=PATH], @@ -83,5 +84,6 @@ AC_SUBST([XTABLES_VERSION_MINOR]) AC_SUBST([XTABLES_VERSION_PATCH]) AC_SUBST([XTABLES_VERSION_EXTRA]) -AC_OUTPUT([Makefile extensions/GNUmakefile libipq/Makefile include/xtables.h - xtables.pc]) +AC_CONFIG_FILES([Makefile extensions/GNUmakefile libipq/Makefile + include/xtables.h xtables.pc]) +AC_OUTPUT diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 00000000..64d9bbcd --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +/libtool.m4 +/lt*.m4 |