summaryrefslogtreecommitdiff
path: root/mount/Makefile.am
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2009-05-19 13:52:43 +0200
committerKarel Zak <kzak@redhat.com>2009-05-22 10:06:15 +0200
commitd94e8a9ebc02f575f15a3fcfa650eb8af8180371 (patch)
treec1290efbd001d5cdebb66c266dc1785e560d201b /mount/Makefile.am
parent17afb0320c77e47a44dc838d3724f89aff06c703 (diff)
downloadutil-linux-old-d94e8a9ebc02f575f15a3fcfa650eb8af8180371.tar.gz
mount: (and fsck) remove libvolume_id support
The libvolume_id is deprecated in favor of libblkid. The libblkid from u-l-ng provides the same functionality as libvolume_id. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount/Makefile.am')
-rw-r--r--mount/Makefile.am8
1 files changed, 0 insertions, 8 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 7714efbc..b0e63740 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -71,7 +71,6 @@ losetup_static_LDFLAGS = $(ldflags_static)
losetup_static_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
endif
-if HAVE_BLKID
if BUILD_LIBBLKID
ldadd_common += $(ul_libblkid_la)
ldadd_static += $(ul_libblkid_la)
@@ -81,13 +80,6 @@ ldadd_common += $(BLKID_LIBS)
ldadd_static += $(BLKID_LIBS_STATIC)
cflags_common += $(BLKID_CFLAGS)
endif
-endif
-
-if HAVE_VOLUME_ID
-ldadd_common += $(VOLUME_ID_LIBS)
-ldadd_static += $(VOLUME_ID_LIBS_STATIC)
-cflags_common += $(VOLUME_ID_CFLAGS)
-endif
if HAVE_SELINUX
mount_LDADD += $(SELINUX_LIBS)