configure: add flag to disable NFLOG build

diff --git a/configure.ac b/configure.ac
index 5bb8644f6507f672dab52528a631eb853617980c..930aef04ce6a66d087e0dcfcaab7afc8ecd0ab86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,13 @@ 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_LOG], [libnetfilter_log >= 1.0.0])
+AC_ARG_ENABLE(nflog,
+       AS_HELP_STRING([--enable-nflog], [Enable nflog module [default=yes]]),,[enable_nflog=yes])
+AS_IF([test "x$enable_nflog" = "xyes"], [
+    PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
+    AC_DEFINE([BUILD_NFLOG], [1], [Building nflog module])
+])
+AM_CONDITIONAL([BUILD_NFLOG], [test "x$enable_nflog" = "xyes"])
 AC_ARG_ENABLE(nfct,
        AS_HELP_STRING([--enable-nfct], [Enable nfct module [default=yes]]),,[enable_nfct=yes])
 AS_IF([test "x$enable_nfct" = "xyes"], [

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 250543b1910f979883c3525c3b3486fdf53295e7..debea91e52119ca56d4e39b406186294e46c511e 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -2,8 +2,10 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \
-                        ulogd_inppkt_UNIXSOCK.la
+pkglib_LTLIBRARIES = ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
+if BUILD_NFLOG
+pkglib_LTLIBRARIES += ulogd_inppkt_NFLOG.la
+endif
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
 ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_LOG_LIBS)

diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 53ee0a3f1d511c8ff9e3c1ea4da95273c9a42f12..bc23ae60f1aba39328c2a1234790610c67875561 100644 (file)
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -18,8 +18,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <libnetfilter_log/libnetfilter_log.h>
 #include "../config.h"
+#ifdef BUILD_NFLOG
+#include <libnetfilter_log/libnetfilter_log.h>
+#endif
 #ifdef BUILD_NFCT
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #endif
@@ -114,6 +116,7 @@ xml_output_flow(struct ulogd_key *inp, char *buf, ssize_t size)
 static int
 xml_output_packet(struct ulogd_key *inp, char *buf, ssize_t size)
 {
+#ifdef BUILD_NFLOG
        struct nflog_data *ldata = ikey_get_ptr(&inp[KEY_PCKT]);
        int tmp;
 
@@ -122,6 +125,9 @@ xml_output_packet(struct ulogd_key *inp, char *buf, ssize_t size)
                return -1;
 
        return 0;
+#else
+       return -1;
+#endif
 }
 
 static int