diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | input/flow/Makefile.am | 2 | ||||
| -rw-r--r-- | output/ulogd_output_XML.c | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 159cb0b..5bb8644 100644 --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,14 @@ AC_SUBST([regular_CFLAGS]) dnl Check for the right nfnetlink version PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) -PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2]) PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0]) +AC_ARG_ENABLE(nfct, + AS_HELP_STRING([--enable-nfct], [Enable nfct module [default=yes]]),,[enable_nfct=yes]) +AS_IF([test "x$enable_nfct" = "xyes"], [ + PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2]) + AC_DEFINE([BUILD_NFCT], [1], [Building nfct module]) +]) +AM_CONDITIONAL([BUILD_NFCT], [test "x$enable_nfct" = "xyes"]) AC_ARG_ENABLE(nfacct, AS_HELP_STRING([--enable-nfacct], [Enable nfacct module [default=yes]]),,[enable_nfacct=yes]) AS_IF([test "x$enable_nfacct" = "xyes"], [ diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am index 127caf6..36c34ca 100644 --- a/input/flow/Makefile.am +++ b/input/flow/Makefile.am @@ -2,11 +2,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} +if BUILD_NFCT pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) ulogd_inpflow_NFCT_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) +endif #ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c #ulogd_inpflow_IPFIX_la_LDFLAGS = -avoid-version -module diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c index 5892a5d..53ee0a3 100644 --- a/output/ulogd_output_XML.c +++ b/output/ulogd_output_XML.c @@ -18,9 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <libnetfilter_conntrack/libnetfilter_conntrack.h> #include <libnetfilter_log/libnetfilter_log.h> #include "../config.h" +#ifdef BUILD_NFCT +#include <libnetfilter_conntrack/libnetfilter_conntrack.h> +#endif #ifdef BUILD_NFACCT #include <libnetfilter_acct/libnetfilter_acct.h> #endif @@ -94,6 +96,7 @@ struct xml_priv { static int xml_output_flow(struct ulogd_key *inp, char *buf, ssize_t size) { +#ifdef BUILD_NFCT struct nf_conntrack *ct = ikey_get_ptr(&inp[KEY_CT]); int tmp; @@ -103,6 +106,9 @@ xml_output_flow(struct ulogd_key *inp, char *buf, ssize_t size) return -1; return 0; +#else + return -1; +#endif } static int |