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

build-sys: add --disable-mount 

I use busybox for most of the utilities, still lacks a few that I wish to use
from util-linux...

So mount comes from busybox.  And during the cross compile I don't want to
compile the mount dependencies only to make the configure script happy...

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Alon Bar-Lev 2008-11-14 18:40:25 +02:00 committed by Karel Zak
parent 1dabcd2498
commit 7177d32ecf
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -17,10 +17,13 @@ SUBDIRS = \
if LINUX
SUBDIRS += \
hwclock \
mount \
partx
endif
if BUILD_MOUNT
SUBDIRS += mount
endif
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
@ -42,5 +45,5 @@ distclean-local:
ENABLE_ALL = --enable-static-programs \
--enable-elvtune --enable-init --enable-kill --enable-last \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
--enable-login-utils --enable-write --enable-arch
--enable-login-utils --enable-write --enable-arch --enable-mount
DISTCHECK_CONFIGURE_FLAGS = --disable-use-tty-group $(ENABLE_ALL)

34
configure.ac
View File

@ -144,20 +144,32 @@ AC_ARG_WITH([fsprobe],
[], [with_fsprobe=blkid]
)
AC_ARG_ENABLE([mount],
AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
[], enable_mount=check
)
AM_CONDITIONAL(HAVE_BLKID, false)
AM_CONDITIONAL(HAVE_VOLUME_ID, false)
have_blkid=no
have_volume_id=no
if test "x$with_fsprobe" = xblkid; then
UTIL_CHECK_LIB(blkid, blkid_known_fstype)
elif test "x$with_fsprobe" = xvolume_id; then
UTIL_CHECK_LIB(volume_id, volume_id_encode_string)
fi
if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
AC_MSG_ERROR([blkid or volume_id is needed to build util-linux-ng.])
if test "${enable_mount}" = "no"; then
build_mount=no
elif test "x$linux_os" = xyes; then
build_mount=yes
have_blkid=no
have_volume_id=no
if test "x$with_fsprobe" = xblkid; then
UTIL_CHECK_LIB(blkid, blkid_known_fstype)
elif test "x$with_fsprobe" = xvolume_id; then
UTIL_CHECK_LIB(volume_id, volume_id_encode_string)
fi
if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
AC_MSG_ERROR([blkid or volume_id is needed to build util-linux-ng mount utilities])
fi
else
AC_MSG_WARN([non-linux system; do not build mount utilities])
build_mount=no
fi
AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
dnl ----------------------------------