autotools: use PKG_CHECK_MODULES for libcap-ng

Replace UL_CHECK_LIB(cap-ng) with PKG_CHECK_MODULES to use the
pkg-config module shipped by libcap-ng. This creates $(CAP_NG_LIBS)
variable, replacing hardcoded -lcap-ng in Makemodule.am files.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 6c9a71e25b04f2aa4ec9671bdadca01cf7e2c88c..4955ba9cfe403e38995fe8aedfcfe58205ec6d31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1678,12 +1678,14 @@ AC_ARG_WITH([cap_ng],
   AS_HELP_STRING([--without-cap-ng], [compile without libcap-ng]),
   [], [with_cap_ng=auto]
 )
+have_cap_ng=no
 AS_IF([test "x$with_cap_ng" = xno], [
   AM_CONDITIONAL([HAVE_CAP_NG], [false])
-  have_cap_ng=no
 ],[
-  UL_CHECK_LIB([cap-ng], [capng_apply], [cap_ng])
+  PKG_CHECK_MODULES([CAP_NG], [libcap-ng], [have_cap_ng=yes], [have_cap_ng=no])
+  AM_CONDITIONAL([HAVE_CAP_NG], [test "x$have_cap_ng" = xyes])
 ])
+AC_SUBST([CAP_NG_LIBS])
 
 
 AC_ARG_ENABLE([setpriv],

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index c90ed7e7ee2b40d9ff9129036c9d6313274400cb..afcfe7c78b634ee3d04f4883b3bd45ab67ce887f 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -598,7 +598,7 @@ dist_noinst_HEADERS += sys-utils/setpriv-landlock.h
 if HAVE_LINUX_LANDLOCK_H
 setpriv_SOURCES += sys-utils/setpriv-landlock.c
 endif
-setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la
+setpriv_LDADD = $(LDADD) $(CAP_NG_LIBS) libcommon.la
 if HAVE_ECONF
 setpriv_LDADD += $(ECONF_LIBS)
 endif

diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am
index 1e02e68a7818f916bd8597ee7ef90bb4def00691..bdf2d2d8dca98feb334ed28fd539e10344b81405 100644 (file)
--- a/tests/helpers/Makemodule.am
+++ b/tests/helpers/Makemodule.am
@@ -58,7 +58,7 @@ endif
 if HAVE_CAP_NG
 check_PROGRAMS += test_cap
 test_cap_SOURCES = tests/helpers/test_cap.c
-test_cap_LDADD = -lcap-ng
+test_cap_LDADD = $(CAP_NG_LIBS)
 endif
 
 check_PROGRAMS += test_open_twice