diff options
| author | David Sterba <dsterba@suse.cz> | 2015-02-03 16:22:55 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-02-03 17:13:55 +0100 |
| commit | 1275c4fc1b31171706277a953ade9b0627c6686b (patch) | |
| tree | a206d4b6883091efe00146d22e494647c4845d9c | |
| parent | e1f0d9d4467a4025cada0443cecc0f9973eee145 (diff) | |
| download | btrfs-progs-1275c4fc1b31171706277a953ade9b0627c6686b.tar.gz | |
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>
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index b87bf82b..c4deb517 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,6 +8,7 @@ RM = @RM@ RMDIR = @RMDIR@ INSTALL = @INSTALL@ DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ +DISABLE_BTRFSCONVERT = @DISABLE_BTRFSCONVERT@ # Non-static compilation flags CFLAGS = @CFLAGS@ \ @@ -67,7 +68,7 @@ endif MAKEOPTS = --no-print-directory Q=$(Q) 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-corrupt-block btrfs-select-super btrfs-calc-size @@ -75,6 +76,10 @@ progs_extra = btrfs-fragments progs_static = $(foreach p,$(progs),$(p).static) +ifneq ($(DISABLE_BTRFSCONVERT),1) +progs += btrfs-convert +endif + # external libs required by various binaries; for btrfs-foo, # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below btrfs_convert_libs = -lext2fs -lcom_err diff --git a/configure.ac b/configure.ac index 74e62b40..f523ba5d 100644 --- a/configure.ac +++ b/configure.ac @@ -85,6 +85,14 @@ if test "x$enable_documentation" = xyes; then AC_PROG_SED 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 |