build: resolve autotools suggestions

build: resolve autotools suggestions

[Jan Engelhardt]

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

Re: build: resolve autotools suggestions

[Pablo Neira Ayuso]

Jan Engelhardt wrote:
> 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.

I don't quite understand this change since I'm not a autotools guru. But
according to the manual, there's a more portable way to do this:

"In the future other Autotools will automatically check the contents of
AC_CONFIG_MACRO_DIR, but at the moment it is more portable to add the
macro directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the
tools currently look. If libtoolize doesn't see AC_CONFIG_MACRO_DIR, it
too will honour the first ‘-I’ argument in ACLOCAL_AMFLAGS when choosing
a directory to store libtool configuration macros in. It is perfectly
sensible to use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS, as long as
they are kept in synchronisation."

I'd appreciate a more detailed clarification on what you want to do. Thanks.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: build: resolve autotools suggestions

[Jan Engelhardt]

On Tuesday 2008-12-30 12:27, Pablo Neira Ayuso wrote:
>Jan Engelhardt wrote:
>> 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.
>
>I don't quite understand this change since I'm not a autotools guru. But
>according to the manual, there's a more portable way to do this:
>
>I'd appreciate a more detailed clarification on what you want to do. Thanks.

When run without AC_CONFIG_MACRO_DIR, autotools will suggest
(in a message printed to the screen) that it should be done so:

libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.

Not much more, except for adding a gitignore for m4.

Re: build: resolve autotools suggestions

[Pablo Neira Ayuso]

Jan Engelhardt wrote:
> On Tuesday 2008-12-30 12:27, Pablo Neira Ayuso wrote:
>> Jan Engelhardt wrote:
>>> 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.
>> I don't quite understand this change since I'm not a autotools guru. But
>> according to the manual, there's a more portable way to do this:
>>
>> I'd appreciate a more detailed clarification on what you want to do. Thanks.
> 
> When run without AC_CONFIG_MACRO_DIR, autotools will suggest
> (in a message printed to the screen) that it should be done so:
> 
> libtoolize: putting auxiliary files in `.'.
> libtoolize: copying file `./ltmain.sh'
> libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
> libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
> libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
> 
> Not much more, except for adding a gitignore for m4.

Applied. Thanks. Any other missing patch to apply to iptables from your
side? I remember those to deprecate -b for iptables-save/restore but I
prefer to add a warning before removing them as I suggested.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: build: resolve autotools suggestions

[Jan Engelhardt]

On Wednesday 2009-01-07 15:15, Pablo Neira Ayuso wrote:
>
>Applied. Thanks. Any other missing patch to apply to iptables from your
>side? I remember those to deprecate -b for iptables-save/restore but I
>prefer to add a warning before removing them as I suggested.

I really really doubt anyone ever used it -- since there was no code,
there was no effect.

Re: build: resolve autotools suggestions

[Pablo Neira Ayuso]

Jan Engelhardt wrote:
> On Wednesday 2009-01-07 15:15, Pablo Neira Ayuso wrote:
>> Applied. Thanks. Any other missing patch to apply to iptables from your
>> side? I remember those to deprecate -b for iptables-save/restore but I
>> prefer to add a warning before removing them as I suggested.
> 
> I really really doubt anyone ever used it -- since there was no code,
> there was no effect.

I agree, but I prefer being conservative here (and unless that Patrick
has a different opinion here).

Anyway, I'm just requesting a notice message to warn about the deletion,
and later on delete it. It's the same end for this story but making the
film a bit longer.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers