From 587dcba946b0a4a1e763940353afff68ee3ea1ba Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Fri, 24 Apr 2015 21:44:58 +0200 Subject: 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. --- configure.ac | 8 ++++++++ input/packet/Makefile.am | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b7c1654..df93f72 100644 --- 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 1c884b8..1c3151d 100644 --- 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 -- cgit v1.2.3