From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 Apr 2026 13:31:55 +0000 (+0200)
Subject: autotools: use PKG_CHECK_MODULES for libudev
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=660a5ed7dff9c55cab6107ec24e6223da207d657;p=thirdparty%2Futil-linux.git

autotools: use PKG_CHECK_MODULES for libudev

Replace UL_CHECK_LIB(udev) with PKG_CHECK_MODULES to use the
pkg-config module shipped by libudev. This creates $(UDEV_LIBS)
variable, replacing hardcoded -ludev in Makemodule.am files.

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

diff --git a/configure.ac b/configure.ac
index 33a93dbf2..d41fe419b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1103,15 +1103,21 @@ AC_ARG_WITH([udev], AS_HELP_STRING([--without-udev], [compile without udev suppo
   [], [with_udev=auto]
 )
 
+have_udev=no
 AS_IF([test "x$with_udev" = xno], [
   AM_CONDITIONAL([HAVE_UDEV], [false])
 ], [
-  UL_CHECK_LIB([udev], [udev_new])
+  PKG_CHECK_MODULES([UDEV], [libudev], [have_udev=yes], [have_udev=no])
   AS_CASE([$with_udev:$have_udev],
     [yes:no],
       [AC_MSG_ERROR([udev selected but libudev not found])]
   )
+  AS_IF([test "x$have_udev" = xyes], [
+    AC_DEFINE([HAVE_LIBUDEV], [1], [Define if udev is available])
+    AM_CONDITIONAL([HAVE_UDEV], [true])
+  ])
 ])
+AC_SUBST([UDEV_LIBS])
 
 
 dnl wide-char ncurses
diff --git a/lsblk-cmd/Makemodule.am b/lsblk-cmd/Makemodule.am
index 2cba6863c..f7579e7c2 100644
--- a/lsblk-cmd/Makemodule.am
+++ b/lsblk-cmd/Makemodule.am
@@ -12,7 +12,7 @@ lsblk_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la \
 		libsmartcols.la libtcolors.la
 lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
 if HAVE_UDEV
-lsblk_LDADD += -ludev
+lsblk_LDADD += $(UDEV_LIBS)
 endif
 endif # BUILD_LSBLK
 
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 234976512..4ff4a0090 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -205,7 +205,7 @@ findmnt_SOURCES = misc-utils/findmnt.c \
 		  misc-utils/findmnt-verify.c \
 		  misc-utils/findmnt.h
 if HAVE_UDEV
-findmnt_LDADD += -ludev
+findmnt_LDADD += $(UDEV_LIBS)
 endif
 endif # BUILD_FINDMNT