From 3c2229da2e7f7ba9f08b24a2581a22edc02b38dc Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sat, 9 Oct 2021 12:38:32 +0100 Subject: build: add pkg-config configuration for libipulog Put libnfnetlink and libnetfilter_log 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 Signed-off-by: Pablo Neira Ayuso --- Makefile.am | 2 +- configure.ac | 11 ++++++++--- libnetfilter_log_libipulog.pc.in | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 libnetfilter_log_libipulog.pc.in diff --git a/Makefile.am b/Makefile.am index 2a9cdd8..c7b86f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,4 +5,4 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = Make_global.am pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnetfilter_log.pc +pkgconfig_DATA = libnetfilter_log.pc libnetfilter_log_libipulog.pc diff --git a/configure.ac b/configure.ac index 8360e91..1723426 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,12 @@ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2], AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1]) dnl Output the makefile -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile - include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc - doxygen.cfg]) +AC_CONFIG_FILES([Makefile + src/Makefile + include/Makefile + include/libnetfilter_log/Makefile + utils/Makefile + libnetfilter_log.pc + libnetfilter_log_libipulog.pc + doxygen.cfg]) AC_OUTPUT diff --git a/libnetfilter_log_libipulog.pc.in b/libnetfilter_log_libipulog.pc.in new file mode 100644 index 0000000..1b7d17a --- /dev/null +++ b/libnetfilter_log_libipulog.pc.in @@ -0,0 +1,16 @@ +# libnetfilter_log_libipulog pkg-config file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libnetfilter_log_libipulog +Description: Netfilter ULOG userspace compat library +URL: http://netfilter.org/projects/libnetfilter_log/ +Version: @VERSION@ +Requires.private: libnetfilter_log >= @VERSION@, + libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@ +Conflicts: +Libs: -L${libdir} -lnetfilter_log_libipulog +Cflags: -I${includedir} -- cgit v1.2.3