From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [RFC libnetfilter_log][PATCH] configure: add --without-ipulog option to disable libipulog build
Date: Wed, 12 Feb 2014 23:53:38 +0100 [thread overview]
Message-ID: <20140212225337.GA6744@localhost> (raw)
In-Reply-To: <1391606337-8706-1-git-send-email-Matthieu.Crapet@ingenico.com>
On Wed, Feb 05, 2014 at 02:18:57PM +0100, Matthieu Crapet wrote:
> This is a compat library used for netfilter ULOG target.
> ULOG only works with IPv4. NFLOG has replaced ULOG.
Applied minor glitch, thanks.
> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
> ---
> configure.ac | 5 +++++
> include/libnetfilter_log/Makefile.am | 4 ++++
> src/Makefile.am | 6 +++++-
> utils/Makefile.am | 7 +++++--
> 4 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index fe6e75f..01f6890 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -23,6 +23,11 @@ case "$host" in
> *) AC_MSG_ERROR([Linux only, dude!]);;
> esac
>
> +AC_ARG_WITH([ipulog],
> + AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]),
> + [ipulog_skip=1], [ipulog_skip=0])
> +AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0])
> +
> dnl Dependencies
> PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
>
> diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
> index fe934f1..0305357 100644
> --- a/include/libnetfilter_log/Makefile.am
> +++ b/include/libnetfilter_log/Makefile.am
> @@ -1,3 +1,7 @@
>
> +if BUILD_IPULOG
> pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
> +else
> +pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
> +endif
Just to avoid redundancy:
@@ -1,3 +1,6 @@
-pkginclude_HEADERS = libnetfilter_log.h libipulog.h
linux_nfnetlink_log.h
+pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
+if BUILD_IPULOG
+pkginclude_HEADERS += libipulog.h
+endif
prev parent reply other threads:[~2014-02-12 22:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 13:18 [RFC libnetfilter_log][PATCH] configure: add --without-ipulog option to disable libipulog build Matthieu Crapet
2014-02-12 22:53 ` Pablo Neira Ayuso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140212225337.GA6744@localhost \
--to=pablo@netfilter.org \
--cc=Matthieu.Crapet@ingenico.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).