From d9c72aa59130c6691304b0b81cf0837a0ecc932b Mon Sep 17 00:00:00 2001 From: David Riebenbauer Date: Mon, 26 May 2014 09:49:43 +0200 Subject: [PATCH 1/2] Introduce new build dependency on libblkid Link against libblkid to get a way to probe media of legacy devices, like floppy drives, for the media's filesystem prior to mounting. Note that on the majority of systems, libblkid will already be present and be used by both mount(8) and udevd(8). So, it won't introduce a new runtime dependency, on these systems. --- configure.ac | 4 ++++ src/Makefile.am | 3 +++ 2 files changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 3a39b5a..2e1c012 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,10 @@ AC_SUBST(HAVE_LIBSYSTEMD_LOGIN) AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) +PKG_CHECK_MODULES(BLKID, [blkid >= 2.17.0]) +AC_SUBST(BLKID_CFLAGS) +AC_SUBST(BLKID_LIBS) + # udevdir AC_ARG_WITH([udevdir], AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]), diff --git a/src/Makefile.am b/src/Makefile.am index fc44c75..b505bd3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,7 @@ INCLUDES = \ $(GLIB_CFLAGS) \ $(GIO_CFLAGS) \ $(WARN_CFLAGS) \ + $(BLKID_CFLAGS) \ $(NULL) # ---------------------------------------------------------------------------------------------------- @@ -91,6 +92,7 @@ libudisks_daemon_la_CFLAGS = \ $(POLKIT_GOBJECT_1_CFLAGS) \ $(ACL_CFLAGS) \ $(LIBSYSTEMD_LOGIN_CFLAGS) \ + $(BLKID_CFLAGS) \ $(NULL) libudisks_daemon_la_LIBADD = \ @@ -101,6 +103,7 @@ libudisks_daemon_la_LIBADD = \ $(POLKIT_GOBJECT_1_LIBS) \ $(ACL_LIBS) \ $(LIBSYSTEMD_LOGIN_LIBS) \ + $(BLKID_LIBS) \ $(top_builddir)/udisks/libudisks2.la \ $(NULL) -- 2.0.0.rc4