From 0086b8bf9cf74642f6d6d82d9bbaedc80fec1dca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 7 Jan 2009 15:11:59 +0100 Subject: build: resolve autotools suggestions libtool2 wants to put files into m4, so let it have it. Signed-off-by: Jan Engelhardt Signed-off-by: Pablo Neira Ayuso --- Makefile.am | 1 + configure.ac | 10 ++++++---- m4/.gitignore | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 m4/.gitignore 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 -- cgit v1.2.3