build-sys: cleanup mount stuff in configure.am

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

diff --git a/configure.ac b/configure.ac
index adb5758e535bcbc3de53d6fda511e224bc4141cd..3bbc374ee57ed0484311325c56aa8e9b65f44be7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -730,27 +730,25 @@ UL_REQUIRES_BUILD([deprecated_mount], [libblkid])
 AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, test "x$build_deprecated_mount" = xyes)
 
 
-AC_ARG_ENABLE([losetup],
-  AS_HELP_STRING([--disable-losetup], [do not build losetup]),
-  [], enable_losetup=check
-)
-UL_BUILD_INIT([losetup])
-UL_REQUIRES_LINUX([losetup])
-AM_CONDITIONAL(BUILD_LOSETUP, test "x$build_losetup" = xyes)
-
-
 AC_ARG_ENABLE([mount],
   AS_HELP_STRING([--disable-mount], [do not build mount(8) and umount(8)]),
   [], enable_mount=check
 )
 UL_BUILD_INIT([mount])
 UL_REQUIRES_BUILD([mount], [libmount])
-if test "x$build_mount" = xyes; then
-  AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, [false])
-fi
+UL_CONFLICTS_BUILD([mount], [deprecated_mount], [old deprecated mount version])
 AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
 
 
+AC_ARG_ENABLE([losetup],
+  AS_HELP_STRING([--disable-losetup], [do not build losetup]),
+  [], enable_losetup=check
+)
+UL_BUILD_INIT([losetup])
+UL_REQUIRES_LINUX([losetup])
+AM_CONDITIONAL(BUILD_LOSETUP, test "x$build_losetup" = xyes)
+
+
 AC_ARG_ENABLE([fsck],
   AS_HELP_STRING([--disable-fsck], [do not build fsck]),
   [], enable_fsck=check