Add flag to disable ULOG input plugin

ULOG target is removed from kernel so we can prepare the removal
of the plugin for ulogd. For now, we just add a configure flag.

diff --git a/configure.ac b/configure.ac
index b7c165466368c3e2ed5382bc58c9e92ca62c862b..df93f726b0f63dc75bef2f09d5fb26d17c74fa2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,13 @@ AC_SUBST([regular_CFLAGS])
 AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""])
 AC_SUBST([libpthread_LIBS])
 
+AC_ARG_ENABLE(ulog,
+       AS_HELP_STRING([--enable-ulog], [Enable ulog module [default=yes]]),[enable_ulog=$enableval],[enable_ulog=yes])
+AM_CONDITIONAL([BUILD_ULOG], [test "x$enable_ulog" = "xyes"])
+if [! test "x$enable_ulog" = "xyes"]; then
+       enable_ulog="no"
+fi
+
 dnl Check for the right nfnetlink version
 PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
 AC_ARG_ENABLE(nflog,
@@ -157,6 +164,7 @@ Ulogd configuration:
     NFLOG plugin:                      ${enable_nflog}
     NFCT plugin:                       ${enable_nfct}
     NFACCT plugin:                     ${enable_nfacct}
+    ULOG plugin:                       ${enable_ulog}
   Output plugins:
     PCAP plugin:                       ${enable_pcap}
     PGSQL plugin:                      ${enable_pgsql}

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 1c884b832300f11856ceed174dd5a877d05cd8c8..1c3151d52f136bd76df458f08633e7a79eaefc3d 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -2,7 +2,12 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_LOG_CFLAGS}
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglib_LTLIBRARIES = ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
+pkglib_LTLIBRARIES = ulogd_inppkt_UNIXSOCK.la
+
+if BUILD_ULOG
+pkglib_LTLIBRARIES += ulogd_inppkt_ULOG.la
+endif
+
 if BUILD_NFLOG
 pkglib_LTLIBRARIES += ulogd_inppkt_NFLOG.la
 endif