RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: autoconf: make btrfs-convert build optional 

Proposed at https://github.com/kdave/btrfs-progs/pull/6, I've added the
configure options.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2015-02-03 16:22:55 +01:00
parent e1f0d9d446
commit 1275c4fc1b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -8,6 +8,7 @@ RM = @RM@
RMDIR = @RMDIR@ RMDIR = @RMDIR@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@
DISABLE_BTRFSCONVERT = @DISABLE_BTRFSCONVERT@
# Non-static compilation flags # Non-static compilation flags
CFLAGS = @CFLAGS@ \ CFLAGS = @CFLAGS@ \
@ -67,7 +68,7 @@ endif
MAKEOPTS = --no-print-directory Q=$(Q) MAKEOPTS = --no-print-directory Q=$(Q)
progs = mkfs.btrfs btrfs-debug-tree btrfsck \ progs = mkfs.btrfs btrfs-debug-tree btrfsck \
btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \ btrfs btrfs-map-logical btrfs-image btrfs-zero-log \
btrfs-find-root btrfstune btrfs-show-super \ btrfs-find-root btrfstune btrfs-show-super \
btrfs-corrupt-block btrfs-select-super btrfs-calc-size btrfs-corrupt-block btrfs-select-super btrfs-calc-size
@ -75,6 +76,10 @@ progs_extra = btrfs-fragments
progs_static = $(foreach p,$(progs),$(p).static) progs_static = $(foreach p,$(progs),$(p).static)
ifneq ($(DISABLE_BTRFSCONVERT),1)
progs += btrfs-convert
endif
# external libs required by various binaries; for btrfs-foo, # external libs required by various binaries; for btrfs-foo,
# specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below
btrfs_convert_libs = -lext2fs -lcom_err btrfs_convert_libs = -lext2fs -lcom_err

8
configure.ac
View File

@ -85,6 +85,14 @@ if test "x$enable_documentation" = xyes; then
AC_PROG_SED AC_PROG_SED
fi fi
AC_ARG_ENABLE([convert],
AS_HELP_STRING([--disable-convert], [do not build btrfs-convert]),
[], [enable_btrfsconvert=yes]
)
AS_IF([test "x$enable_btrfsconvert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1])
AC_SUBST([DISABLE_BTRFSCONVERT])
dnl Define <NAME>_LIBS= and <NAME>_CFLAGS= by pkg-config dnl Define <NAME>_LIBS= and <NAME>_CFLAGS= by pkg-config
dnl dnl