netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog
Date: Sat,  9 Oct 2021 12:38:32 +0100	[thread overview]
Message-ID: <20211009113839.2765382-3-jeremy@azazel.net> (raw)
In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net>

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 --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}
-- 
2.33.0


  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 ` [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration Jeremy Sowden
2021-10-09 11:38 ` Jeremy Sowden [this message]
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-3-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).