[ulogd2] Replace INCLUDES by AM_CPPFLAGS in Makefile.am.

[Eric Leblond]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=13643ceb7396101cc8611c5c366df2a7f0fa5c17
commit 13643ceb7396101cc8611c5c366df2a7f0fa5c17
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Thu Jan 22 14:11:14 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Thu Jan 22 14:11:14 2009 +0100

    Replace INCLUDES by AM_CPPFLAGS in Makefile.am.
    
    This patch fixes autotools warning about deprecated usage of INCLUDES in
    Makefile.am.

commit 71d45403400bdb18bc6ae5efaf4772f6b847c351
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 20 12:08:06 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 20 12:12:32 2009 +0100

    build: update configure.ac
    
    Some constructs in there are old-fashioned. Replace them by their
    modern counterparts.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit d3ced9d5dcdb6b42a4c887b3afbfaaaa2bc09419
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 20 12:05:54 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 20 12:12:17 2009 +0100

    build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR
    
    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.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 433135f373edde9cc9c129b28257844eb1b3642c
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 20 09:04:03 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 20 09:04:24 2009 +0100

    build: use -avoid-version for modules
    
    The modules are pretty much bound to ulogd, and it does not seem
    to make sense to specially version these.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit a04c67dfc98bffef3b00b8ed04e54ca92eedfa1c
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 20 09:00:53 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 20 09:03:43 2009 +0100

    Update .gitignore and remove install-sh
    
    install-sh is autogenerated.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 00f879a81e898b37b9c17c878dc90327ca84684e
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Sun Jan 18 18:50:04 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sun Jan 18 18:50:04 2009 +0100

    build: compile fix
    
    ulogd_inpflow_NFCT.c: In function 'propagate_ct':
    ulogd_inpflow_NFCT.c:483: error: 'IPPROTO_UDPLITE' undeclared (first use in this function)
    
    (and more for IPPROTO_SCTP)
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
       via  13643ceb7396101cc8611c5c366df2a7f0fa5c17 (commit)
       via  71d45403400bdb18bc6ae5efaf4772f6b847c351 (commit)
       via  d3ced9d5dcdb6b42a4c887b3afbfaaaa2bc09419 (commit)
       via  433135f373edde9cc9c129b28257844eb1b3642c (commit)
       via  a04c67dfc98bffef3b00b8ed04e54ca92eedfa1c (commit)
       via  00f879a81e898b37b9c17c878dc90327ca84684e (commit)
      from  75b3becf5b95c4ab5ddcef88b6565de716e5c230 (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 13643ceb7396101cc8611c5c366df2a7f0fa5c17
Author: Eric Leblond <eric at inl.fr>
Date:   Thu Jan 22 14:11:14 2009 +0100

    Replace INCLUDES by AM_CPPFLAGS in Makefile.am.
    
    This patch fixes autotools warning about deprecated usage of INCLUDES in
    Makefile.am.

commit 71d45403400bdb18bc6ae5efaf4772f6b847c351
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jan 20 12:08:06 2009 +0100

    build: update configure.ac
    
    Some constructs in there are old-fashioned. Replace them by their
    modern counterparts.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit d3ced9d5dcdb6b42a4c887b3afbfaaaa2bc09419
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jan 20 12:05:54 2009 +0100

    build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR
    
    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.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 433135f373edde9cc9c129b28257844eb1b3642c
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jan 20 09:04:03 2009 +0100

    build: use -avoid-version for modules
    
    The modules are pretty much bound to ulogd, and it does not seem
    to make sense to specially version these.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit a04c67dfc98bffef3b00b8ed04e54ca92eedfa1c
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jan 20 09:00:53 2009 +0100

    Update .gitignore and remove install-sh
    
    install-sh is autogenerated.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 00f879a81e898b37b9c17c878dc90327ca84684e
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Jan 18 18:50:04 2009 +0100

    build: compile fix
    
    ulogd_inpflow_NFCT.c: In function 'propagate_ct':
    ulogd_inpflow_NFCT.c:483: error: 'IPPROTO_UDPLITE' undeclared (first use in this function)
    
    (and more for IPPROTO_SCTP)
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

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

 .gitignore                      |   24 ++++
 Makefile.am                     |    3 +-
 autogen.sh                      |    7 +-
 configure.in => configure.ac    |   14 ++-
 filter/Makefile.am              |   18 ++--
 filter/raw2packet/Makefile.am   |    4 +-
 input/flow/Makefile.am          |    6 +-
 input/flow/ulogd_inpflow_NFCT.c |    1 +
 input/packet/Makefile.am        |    6 +-
 install-sh                      |  251 ---------------------------------------
 libipulog/Makefile.am           |    2 +-
 m4/.gitignore                   |    2 +
 output/Makefile.am              |   12 +-
 output/dbi/Makefile.am          |    4 +-
 output/mysql/Makefile.am        |    4 +-
 output/pcap/Makefile.am         |    4 +-
 output/pgsql/Makefile.am        |    4 +-
 output/sqlite3/Makefile.am      |    4 +-
 src/.gitignore                  |    1 +
 19 files changed, 74 insertions(+), 297 deletions(-)
 create mode 100644 .gitignore
 rename configure.in => configure.ac (90%)
 delete mode 100755 install-sh
 create mode 100644 m4/.gitignore
 create mode 100644 src/.gitignore
ulogd_inpflow_NFCT.c: In function 'propagate_ct':
ulogd_inpflow_NFCT.c:483: error: 'IPPROTO_UDPLITE' undeclared (first use in this function)

(and more for IPPROTO_SCTP)

Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index 244454b..4605fd9 100644
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -35,6 +35,7 @@
 
 #include <sys/time.h>
 #include <time.h>
+#include <netinet/in.h>
 #include <ulogd/linuxlist.h>
 #include <ulogd/jhash.h>
 #include <ulogd/hash.h>