diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2021-10-09 12:38:31 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-10-12 00:59:08 +0200 |
| commit | f7da00cdc597be1ea5a740aa269a451d8393f0a6 (patch) | |
| tree | afbbeaaa714437795e820ca0a67447987a3f5758 | |
| parent | ad78308508160532f8c464e194bb7b5cd83a2dc9 (diff) | |
build: correct pkg-config dependency configuration
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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | libnetfilter_log.pc.in | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c914e00..8360e91 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 a4b2f3b..9dbed77 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} |