From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration
Date: Sat, 9 Oct 2021 12:38:31 +0100 [thread overview]
Message-ID: <20211009113839.2765382-2-jeremy@azazel.net> (raw)
In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net>
Put libnfnetlink and libmnl in `Requires.private`. They both use
pkg-config (thus `Requires`, not `Libs`), and they are both required for
static builds, but do not need to be exposed otherwise (thus
`Requires.private`).
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 7 +++++--
libnetfilter_log.pc.in | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index c914e00a8ffe..8360e91063ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,11 @@ AC_ARG_WITH([ipulog],
AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno])
dnl Dependencies
-PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
-PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+AC_SUBST([LIBNFNETLINK_MIN_VERSION], [0.0.41])
+AC_SUBST([LIBMNL_MIN_VERSION], [1.0.3])
+
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= ${LIBNFNETLINK_MIN_VERSION}])
+PKG_CHECK_MODULES([LIBMNL], [libmnl >= ${LIBMNL_MIN_VERSION}])
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2],
[HAVE_LNFCT=1], [HAVE_LNFCT=0])
AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1])
diff --git a/libnetfilter_log.pc.in b/libnetfilter_log.pc.in
index a4b2f3bd4f70..9dbed7709632 100644
--- a/libnetfilter_log.pc.in
+++ b/libnetfilter_log.pc.in
@@ -6,11 +6,11 @@ libdir=@libdir@
includedir=@includedir@
Name: libnetfilter_log
-Description: netfilter userspace packet logging library
+Description: Netfilter userspace packet logging library
URL: http://netfilter.org/projects/libnetfilter_log/
Version: @VERSION@
-Requires: libnfnetlink
+Requires.private: libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@,
+ libmnl >= @LIBMNL_MIN_VERSION@
Conflicts:
Libs: -L${libdir} -lnetfilter_log
-Libs.private: @LIBNFNETLINK_LIBS@
Cflags: -I${includedir}
--
2.33.0
next prev parent reply other threads:[~2021-10-09 11:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
2021-10-09 11:38 ` Jeremy Sowden [this message]
2021-10-09 11:38 ` [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 3/9] build: fix linker flags for nf-log Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 4/9] build: move dependency CFLAGS variables out of `AM_CPPFLAGS` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 5/9] build: remove superfluous .la when linking ulog_test Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 6/9] build: remove `-dynamic` when linking check progs Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 7/9] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 8/9] build: replace `AC_HELP_STRING` with `AS_HELP_STRING` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 9/9] Add Emacs artefacts to .gitignore Jeremy Sowden
2021-10-11 23:00 ` [libnetfilter_log PATCH 0/8] Build fixes Pablo Neira Ayuso
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=20211009113839.2765382-2-jeremy@azazel.net \
--to=jeremy@azazel.net \
--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).