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 33a93dbf22ed4f9c9bd2cfdd4fcebb78c30f1f62..d41fe419bc394df983ce47dd875b071a51fe6f16 100644 (file)
--- 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 2cba6863c2c6b38a86f8cae7a8f8bdd22d164569..f7579e7c274d09853bdc03b617633a0dd7979310 100644 (file)
--- 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 23497651297531550d9ff70276fc9f265ea3b69f..4ff4a0090d9325ed89f7f2add51d6c8c14fc60f4 100644 (file)
--- 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