netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* build: resolve autotools suggestions
@ 2008-12-25 19:21 Jan Engelhardt
  2008-12-30 11:27 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 6+ messages in thread
From: Jan Engelhardt @ 2008-12-25 19:21 UTC (permalink / raw)
  To: kaber; +Cc: Netfilter Developer Mailing List

parent cea9f71f5618250a38acb21c31fbbf93a752f7d4
commit 6fdeb9468f1bac11698b200530cd454a167e1e39
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Thu Dec 25 20:21:36 2008 +0100

build: resolve autotools suggestions

libtool2 wants to put files into m4, so let it have it.
---
 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 5465db6..ced23b3 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 39fa0ec..8c9c30d 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 0000000..64d9bbc
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+/libtool.m4
+/lt*.m4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-01-08 15:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-25 19:21 build: resolve autotools suggestions Jan Engelhardt
2008-12-30 11:27 ` Pablo Neira Ayuso
2008-12-30 15:18   ` Jan Engelhardt
2009-01-07 14:15     ` Pablo Neira Ayuso
2009-01-07 23:49       ` Jan Engelhardt
2009-01-08 15:55         ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).