build-sys: default to new sys-utils/mount.c, add --enable-deprecated-mount

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

3 files changed, 22 insertions, 22 deletions

diff --git a/configure.ac b/configure.ac
index 1e9134fdf..24b30bf66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -720,14 +720,14 @@ AC_SUBST([LIBMOUNT_VERSION_INFO])
 AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
 
 
-AC_ARG_ENABLE([mount],
-  AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
-  [], enable_mount=check
+AC_ARG_ENABLE([deprecated-mount],
+  AS_HELP_STRING([--enable-deprecated-mount], [build old mount utilities]),
+  [], enable_deprecated_mount=no
 )
-UL_BUILD_INIT([mount])
-UL_REQUIRES_LINUX([mount])
-UL_REQUIRES_BUILD([mount], [libblkid])
-AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
+UL_BUILD_INIT([deprecated_mount])
+UL_REQUIRES_LINUX([deprecated_mount])
+UL_REQUIRES_BUILD([deprecated_mount], [libblkid])
+AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, test "x$build_deprecated_mount" = xyes)
 
 
 AC_ARG_ENABLE([losetup],
@@ -752,16 +752,16 @@ fi
 AM_CONDITIONAL(BUILD_LIBMOUNT_MOUNT, test "x$build_libmount_mount" = xyes)
 
 
-AC_ARG_ENABLE([new-mount],
-  AS_HELP_STRING([--enable-new-mount], [build new pure libmount based mount(8) (EXPERIMENTAL)]),
-  [], enable_new_mount=no
+AC_ARG_ENABLE([mount],
+  AS_HELP_STRING([--disable-mount], [do not build mount(8) and umount(8)]),
+  [], enable_mount=check
 )
-UL_BUILD_INIT([new_mount])
-UL_REQUIRES_BUILD([new_mount], [libmount])
-if test "x$build_new_mount" = xyes; then
-  AM_CONDITIONAL(BUILD_MOUNT, [false])
+UL_BUILD_INIT([mount])
+UL_REQUIRES_BUILD([mount], [libmount])
+if test "x$build_mount" = xyes; then
+  AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, [false])
 fi
-AM_CONDITIONAL(BUILD_NEW_MOUNT, test "x$build_new_mount" = xyes)
+AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
 
 
 AC_ARG_ENABLE([fsck],
diff --git a/mount-deprecated/Makemodule.am b/mount-deprecated/Makemodule.am
index 03fe51341..7e71a5f51 100644
--- a/mount-deprecated/Makemodule.am
+++ b/mount-deprecated/Makemodule.am
@@ -1,4 +1,4 @@
-if BUILD_MOUNT
+if BUILD_DEPRECATED_MOUNT
 
 bin_PROGRAMS += mount umount
 dist_man_MANS += \
@@ -96,4 +96,4 @@ install-exec-hook-mount:
 INSTALL_EXEC_HOOKS += install-exec-hook-mount
 endif
 
-endif # BUILD_MOUNT
+endif # BUILD_DEPRECATED_MOUNT
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index c19be4ceb..6e5aefcae 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -90,13 +90,13 @@ prlimit_SOURCES = \
 endif
 
 
-if BUILD_NEW_MOUNT
+if BUILD_MOUNT
 # 
-# The original (stable) mount is in mount/ directory
+# The original mount is in mount/ directory
 # -- temporary we share some man pages
 #
 bin_PROGRAMS += mount umount
-dist_man_MANS += mount.8 ../mount/umount.8
+dist_man_MANS += mount.8 ../deprecated-mount/umount.8
 
 mount_SOURCES = \
 	mount.c \
@@ -128,7 +128,7 @@ umount_static_CFLAGS = $(umount_CFLAGS)
 umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static
 umount_static_LDADD = $(umount_LDADD)
 endif
-endif # BUILD_NEW_MOUNT
+endif # BUILD_MOUNT
 
 
 if BUILD_SWAPON
@@ -266,7 +266,7 @@ install-exec-hook:
 if BUILD_SWAPON
 	cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff
 endif
-if BUILD_NEW_MOUNT
+if BUILD_MOUNT
 if MAKEINSTALL_DO_SETUID
 	chmod 4755 $(DESTDIR)$(bindir)/mount
 	chmod 4755 $(DESTDIR)$(bindir)/umount