[conntrack-tools] build: replace INCLUDES by AM_CPPFLAGS according to autoreconf

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=bf08896f823d350f020b7d37940e41cb7107c28a
commit bf08896f823d350f020b7d37940e41cb7107c28a
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Mon Jan 26 19:39:47 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Jan 26 19:39:47 2009 +0100

    build: replace INCLUDES by AM_CPPFLAGS according to autoreconf
    
    This patch replaces INCLUDES by AM_CPPFLAGS according to a
    suggestion from autoreconf.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 4dd73e4e34b57685d8a85e041f6a0b4a65200e30
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Mon Jan 26 19:30:33 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Jan 26 19:30:33 2009 +0100

    build: upgrade build system
    
    - add .gitignore files
    - replace outdated autoconf macros by new constructs, including autogen.sh
    - and use AC_CONFIG_MACRO_DIR as suggested by libtool2:
    
    libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and
    libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
    libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  bf08896f823d350f020b7d37940e41cb7107c28a (commit)
       via  4dd73e4e34b57685d8a85e041f6a0b4a65200e30 (commit)
      from  9532b922795943b0ea24e18cc878b28b7833b92e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf08896f823d350f020b7d37940e41cb7107c28a
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Mon Jan 26 19:39:47 2009 +0100

    build: replace INCLUDES by AM_CPPFLAGS according to autoreconf
    
    This patch replaces INCLUDES by AM_CPPFLAGS according to a
    suggestion from autoreconf.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 4dd73e4e34b57685d8a85e041f6a0b4a65200e30
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Jan 26 19:30:33 2009 +0100

    build: upgrade build system
    
    - add .gitignore files
    - replace outdated autoconf macros by new constructs, including autogen.sh
    - and use AC_CONFIG_MACRO_DIR as suggested by libtool2:
    
    libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and
    libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
    libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 Make_global.am |    2 +-
 Makefile.am    |    1 +
 autogen.sh     |   18 ++----------------
 configure.in   |    6 ++++--
 4 files changed, 8 insertions(+), 19 deletions(-)
- add .gitignore files
- replace outdated autoconf macros by new constructs, including autogen.sh
- and use AC_CONFIG_MACRO_DIR as suggested by libtool2:

libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.

Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/Makefile.am b/Makefile.am
index 7383328..fde65aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ include Make_global.am
 
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
+ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = conntrack.8 conntrackd.8
diff --git a/autogen.sh b/autogen.sh
index e76d3ef..36b2a2a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,18 +1,4 @@
 #!/bin/sh
 
-run ()
-{
-    echo "running: $*"
-    eval $*
-
-    if test $? != 0 ; then
-	echo "error: while running '$*'"
-	exit 1
-    fi
-}
-
-run aclocal
-run libtoolize -f
-#run autoheader
-run automake -a
-run autoconf
+autoreconf -fi;
+rm -Rf autom4te.cache;
diff --git a/configure.in b/configure.in
index c430df7..cd2e7d5 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,8 @@ AC_INIT(conntrack-tools, 0.9.10, pablo at netfilter.org)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([-Wall])
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -130,4 +131,5 @@ CFLAGS="$CFLAGS $LIBNETFILTER_CONNTRACK_CFLAGS"
 
 AC_SUBST(LIBNETFILTER_CONNTRACK_LIBS)
 
-AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile include/Makefile extensions/Makefile])
+AC_OUTPUT