ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-05-30 17:29:01 +02:00
parent 964339a986
commit 434b07a090
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@ -720,14 +720,14 @@ AC_SUBST([LIBMOUNT_VERSION_INFO])
AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string]) AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
AC_ARG_ENABLE([mount], AC_ARG_ENABLE([deprecated-mount],
AS_HELP_STRING([--disable-mount], [do not build mount utilities]), AS_HELP_STRING([--enable-deprecated-mount], [build old mount utilities]),
[], enable_mount=check [], enable_deprecated_mount=no
) )
UL_BUILD_INIT([mount]) UL_BUILD_INIT([deprecated_mount])
UL_REQUIRES_LINUX([mount]) UL_REQUIRES_LINUX([deprecated_mount])
UL_REQUIRES_BUILD([mount], [libblkid]) UL_REQUIRES_BUILD([deprecated_mount], [libblkid])
AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes) AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, test "x$build_deprecated_mount" = xyes)
AC_ARG_ENABLE([losetup], AC_ARG_ENABLE([losetup],
@ -752,16 +752,16 @@ fi
AM_CONDITIONAL(BUILD_LIBMOUNT_MOUNT, test "x$build_libmount_mount" = xyes) AM_CONDITIONAL(BUILD_LIBMOUNT_MOUNT, test "x$build_libmount_mount" = xyes)
AC_ARG_ENABLE([new-mount], AC_ARG_ENABLE([mount],
AS_HELP_STRING([--enable-new-mount], [build new pure libmount based mount(8) (EXPERIMENTAL)]), AS_HELP_STRING([--disable-mount], [do not build mount(8) and umount(8)]),
[], enable_new_mount=no [], enable_mount=check
) )
UL_BUILD_INIT([new_mount]) UL_BUILD_INIT([mount])
UL_REQUIRES_BUILD([new_mount], [libmount]) UL_REQUIRES_BUILD([mount], [libmount])
if test "x$build_new_mount" = xyes; then if test "x$build_mount" = xyes; then
AM_CONDITIONAL(BUILD_MOUNT, [false]) AM_CONDITIONAL(BUILD_DEPRECATED_MOUNT, [false])
fi 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], AC_ARG_ENABLE([fsck],

4
mount-deprecated/Makemodule.am
View File

@ -1,4 +1,4 @@
if BUILD_MOUNT if BUILD_DEPRECATED_MOUNT
bin_PROGRAMS += mount umount bin_PROGRAMS += mount umount
dist_man_MANS += \ dist_man_MANS += \
@ -96,4 +96,4 @@ install-exec-hook-mount:
INSTALL_EXEC_HOOKS += install-exec-hook-mount INSTALL_EXEC_HOOKS += install-exec-hook-mount
endif endif
endif # BUILD_MOUNT endif # BUILD_DEPRECATED_MOUNT

10
sys-utils/Makefile.am
View File

@ -90,13 +90,13 @@ prlimit_SOURCES = \
endif 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 # -- temporary we share some man pages
# #
bin_PROGRAMS += mount umount bin_PROGRAMS += mount umount
dist_man_MANS += mount.8 ../mount/umount.8 dist_man_MANS += mount.8 ../deprecated-mount/umount.8
mount_SOURCES = \ mount_SOURCES = \
mount.c \ mount.c \
@ -128,7 +128,7 @@ umount_static_CFLAGS = $(umount_CFLAGS)
umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static
umount_static_LDADD = $(umount_LDADD) umount_static_LDADD = $(umount_LDADD)
endif endif
endif # BUILD_NEW_MOUNT endif # BUILD_MOUNT
if BUILD_SWAPON if BUILD_SWAPON
@ -266,7 +266,7 @@ install-exec-hook:
if BUILD_SWAPON if BUILD_SWAPON
cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff
endif endif
if BUILD_NEW_MOUNT if BUILD_MOUNT
if MAKEINSTALL_DO_SETUID if MAKEINSTALL_DO_SETUID
chmod 4755 $(DESTDIR)$(bindir)/mount chmod 4755 $(DESTDIR)$(bindir)/mount
chmod 4755 $(DESTDIR)$(bindir)/umount chmod 4755 $(DESTDIR)$(bindir)/umount