diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-08-26 15:01:10 +0100 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-08-26 15:01:10 +0100 |
| commit | ca0dc13dd212ef8ca19fa6128115fe933b055437 (patch) | |
| tree | 72ae182f3228d40e5323af2f3dbc6fd6afc9aec8 /configure.ac | |
| parent | f920a62c2727afb328f967a79bf2e58497007112 (diff) | |
New upstream release.debian/4.7.1-1
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 901d4347..97e89f23 100644 --- a/configure.ac +++ b/configure.ac @@ -104,13 +104,44 @@ AC_ARG_ENABLE([convert], AS_IF([test "x$enable_convert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1]) AC_SUBST([DISABLE_BTRFSCONVERT]) +AC_ARG_WITH([convert], + AS_HELP_STRING([[[]--with-convert[[=auto]]]], [built-in filesystems for convert (default: auto) +supported (comma separated list): ext2]), + [], [with_convert=auto] +) + +if test "$with_convert" = "yes"; then + with_convert=auto +fi + +if test "$with_convert" = "no"; then + with_convert= +fi + +convertfs= +BTRFSCONVERT_EXT2=0 if test "x$enable_convert" = xyes; 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(COM_ERR, [com_err]) + 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(COM_ERR, [com_err]) + convertfs="${convertfs:+$convertfs,}ext2" + BTRFSCONVERT_EXT2=1 + fi +fi +AC_SUBST([BTRFSCONVERT_EXT2]) + +# catch typos +tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e 's/,\+/,/') +if ! test "x$tmp" = "x"; then + AC_MSG_ERROR([unknown tokens for --with-convert: $tmp]) +fi + +if test "$DISABLE_BTRFSCONVERT" = 0 && test "x$convertfs" = "x"; then + AC_MSG_ERROR([no filesystems for convert, use --disable-convert instead]) fi AX_CHECK_DEFINE([linux/fiemap.h], [FIEMAP_EXTENT_SHARED], [], @@ -176,7 +207,7 @@ AC_MSG_RESULT([ documentation: ${enable_documentation} backtrace support: ${enable_backtrace} - btrfs-convert: ${enable_convert} + btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} Type 'make' to compile. ]) |