[ulogd2] This patch is a backport of Jaap Keuter fix for PCAP output module.

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=1c74f0d9378aae74f92905c8c6383494dbeadf6f
commit 1c74f0d9378aae74f92905c8c6383494dbeadf6f
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Wed Jun 18 17:41:23 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Jun 18 17:41:23 2008 +0200

    This patch is a backport of Jaap Keuter fix for PCAP output module.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>

commit 55b658419e2eda521c7fd2f836fe436931af7f3f
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Wed Jun 18 17:40:48 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Jun 18 17:40:48 2008 +0200

    Fix warning in compilation due to missing include
    
    strerror function was used without inclusion of string.h. This patch
    adds the include and fixes the warning.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>

commit 366c781ce4c07662c643c77031b1e74ef757149c
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Wed Jun 18 17:39:37 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Jun 18 17:39:37 2008 +0200

    Fix NFCT/NFLOG plugin compilation when libraries use non-standard prefix.
    
    Fixes compilation of NFLOG and NFCT plugin when libnetfilter libraries
    are installed under a non standard prefix. Include path and libs path
    for libnetfilter_conntrack and libnetfilter_log were not correctly set even
    if pkg-config found them.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>
       via  1c74f0d9378aae74f92905c8c6383494dbeadf6f (commit)
       via  55b658419e2eda521c7fd2f836fe436931af7f3f (commit)
       via  366c781ce4c07662c643c77031b1e74ef757149c (commit)
      from  189fda46127361883ba81e1296e2b49a812e9bc6 (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 1c74f0d9378aae74f92905c8c6383494dbeadf6f
Author: Eric Leblond <eric at inl.fr>
Date:   Wed Jun 18 17:41:23 2008 +0200

    This patch is a backport of Jaap Keuter fix for PCAP output module.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>

commit 55b658419e2eda521c7fd2f836fe436931af7f3f
Author: Eric Leblond <eric at inl.fr>
Date:   Wed Jun 18 17:40:48 2008 +0200

    Fix warning in compilation due to missing include
    
    strerror function was used without inclusion of string.h. This patch
    adds the include and fixes the warning.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>

commit 366c781ce4c07662c643c77031b1e74ef757149c
Author: Eric Leblond <eric at inl.fr>
Date:   Wed Jun 18 17:39:37 2008 +0200

    Fix NFCT/NFLOG plugin compilation when libraries use non-standard prefix.
    
    Fixes compilation of NFLOG and NFCT plugin when libnetfilter libraries
    are installed under a non standard prefix. Include path and libs path
    for libnetfilter_conntrack and libnetfilter_log were not correctly set even
    if pkg-config found them.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>

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

 input/flow/Makefile.am           |    3 ++-
 input/packet/Makefile.am         |    3 ++-
 input/packet/ulogd_inppkt_ULOG.c |    1 +
 output/pcap/ulogd_output_PCAP.c  |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
Fixes compilation of NFLOG and NFCT plugin when libnetfilter libraries
are installed under a non standard prefix. Include path and libs path
for libnetfilter_conntrack and libnetfilter_log were not correctly set even
if pkg-config found them.

Signed-off-by: Eric Leblond <eric at inl.fr>

diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 235dc9b..288d335 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS=-fPIC -Wall
 pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 
 ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
-ulogd_inpflow_NFCT_la_LDFLAGS = -module -lnetfilter_conntrack
+ulogd_inpflow_NFCT_la_LDFLAGS = -module $(LIBNETFILTER_CONNTRACK_LIBS)
+ulogd_inpflow_NFCT_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
 
 #ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
 #ulogd_inpflow_IPFIX_la_LDFLAGS = -module
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 1932a20..a07f724 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -6,7 +6,8 @@ LIBS=
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
-ulogd_inppkt_NFLOG_la_LDFLAGS = -module -lnetfilter_log
+ulogd_inppkt_NFLOG_la_LDFLAGS = -module $(LIBNETFILTER_LOG_LIBS)
+ulogd_inppkt_NFLOG_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_LOG_CFLAGS)
 
 ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
 ulogd_inppkt_ULOG_la_LDFLAGS = -module