diff options
author | Jeff Mahoney <jeffm@suse.com> | 2018-04-30 10:37:06 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-06-07 16:37:35 +0200 |
commit | 36da47b409535f947549dcf560a3b1c1bd38af4a (patch) | |
tree | 9aea81e6006d1852f47b421ef7fd907f75ac6cbc /configure.ac | |
parent | 4aebb2588c3f3164eba5833ffaf4eb101a05abb2 (diff) |
btrfs-progs: convert: fix support for e2fsprogs < 1.42
Commit 324d4c1857a (btrfs-progs: convert: Add larger device support)
introduced new dependencies on the 64-bit API provided by e2fsprogs.
That API was introduced in v1.42 (along with bigalloc).
This patch maps the following to their equivalents in e2fsprogs < 1.42.
- ext2fs_get_block_bitmap_range2
- ext2fs_inode_data_blocks2
- ext2fs_read_ext_attr2
Since we need to detect and define EXT2_FLAG_64BITS for compatibilty
anyway, it makes sense to use that to detect the older e2fsprogs instead
of defining a new flag ourselves.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a4c98b31..17978f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -144,11 +144,7 @@ BTRFSCONVERT_EXT2=0 BTRFSCONVERT_REISERFS=0 if test "x$enable_convert" = xyes; then if test "x$with_convert" = "xauto" || echo "$with_convert" | grep -q "ext2"; then - PKG_CHECK_MODULES(EXT2FS, [ext2fs >= 1.42],, - [PKG_CHECK_MODULES(EXT2FS, [ext2fs], - [AC_DEFINE([HAVE_OLD_E2FSPROGS], [1], - [E2fsprogs does not support BIGALLOC])] - )]) + PKG_CHECK_MODULES(EXT2FS, [ext2fs]) PKG_CHECK_MODULES(COM_ERR, [com_err]) convertfs="${convertfs:+$convertfs,}ext2" BTRFSCONVERT_EXT2=1 |