diff mbox series

[libnetfilter_log,1/9] build: correct pkg-config dependency configuration

Message ID 20211009113839.2765382-2-jeremy@azazel.net
State Accepted
Delegated to: Pablo Neira
Headers show
Series Build fixes | expand

Commit Message

Jeremy Sowden Oct. 9, 2021, 11:38 a.m. UTC
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 mbox series

Patch

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}