summaryrefslogtreecommitdiff
path: root/mount
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2010-12-07 00:16:07 +0100
committerKarel Zak <kzak@redhat.com>2011-01-03 12:28:47 +0100
commit37ef0439da961d001a3921cd2939311946fe64a9 (patch)
treeab4b53f8287c8fbe9dc5dbff3fae10b824237c75 /mount
parent8b95253ff0f99b0d94b32bd663f5a54f732b0034 (diff)
downloadutil-linux-old-37ef0439da961d001a3921cd2939311946fe64a9.tar.gz
build-sys: add --enable-libmount-mount
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount')
-rw-r--r--mount/Makefile.am17
1 files changed, 17 insertions, 0 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 36b06e32..9613d283 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -88,9 +88,26 @@ mount_LDADD += $(SELINUX_LIBS)
mount_static_LDADD += $(SELINUX_LIBS_STATIC)
endif
+if BUILD_LIBMOUNT_MOUNT
+mount_LDADD += $(ul_libmount_la)
+mount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
+umount_LDADD += $(ul_libmount_la)
+umount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
+if HAVE_STATIC_MOUNT
+mount_static_LDADD += $(ul_libmount_la)
+mount_static_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
+endif
+if HAVE_STATIC_UMOUNT
+umount_static_LDADD += $(ul_libmount_la)
+umount_static_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
+endif
+endif
+
+if !BUILD_LIBMOUNT_MOUNT
noinst_PROGRAMS = mtab_lock_test
mtab_lock_test_SOURCES = fstab.c $(srcs_common) $(hdrs_mount)
mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
+endif
install-exec-hook:
cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff