diff mbox series

[libnetfilter_log,2/9] build: add pkg-config configuration for libipulog

Message ID 20211009113839.2765382-3-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 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 <jeremy@azazel.net>
---
 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 mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index 2a9cdd826dae..c7b86f77aee6 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 8360e91063ae..1723426aa0c4 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 000000000000..1b7d17a0ac62
--- /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}