diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 66 |
1 files changed, 55 insertions, 11 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for btrfs-progs v4.7. +# Generated by GNU Autoconf 2.69 for btrfs-progs v4.7.1. # # Report bugs to <linux-btrfs@vger.kernel.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='btrfs-progs' PACKAGE_TARNAME='btrfs-progs' -PACKAGE_VERSION='v4.7' -PACKAGE_STRING='btrfs-progs v4.7' +PACKAGE_VERSION='v4.7.1' +PACKAGE_STRING='btrfs-progs v4.7.1' PACKAGE_BUGREPORT='linux-btrfs@vger.kernel.org' PACKAGE_URL='http://btrfs.wiki.kernel.org' @@ -641,6 +641,7 @@ UUID_CFLAGS BLKID_LIBS_STATIC BLKID_LIBS BLKID_CFLAGS +BTRFSCONVERT_EXT2 COM_ERR_LIBS COM_ERR_CFLAGS EXT2FS_LIBS @@ -725,6 +726,7 @@ enable_largefile enable_backtrace enable_documentation enable_convert +with_convert ' ac_precious_vars='build_alias host_alias @@ -1288,7 +1290,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures btrfs-progs v4.7 to adapt to many kinds of systems. +\`configure' configures btrfs-progs v4.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1355,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of btrfs-progs v4.7:";; + short | recursive ) echo "Configuration of btrfs-progs v4.7.1:";; esac cat <<\_ACEOF @@ -1366,6 +1368,13 @@ Optional Features: --disable-documentation do not build domumentation --disable-convert do not build btrfs-convert +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-convert[=auto] + built-in filesystems for convert (default: auto) + supported (comma separated list): ext2 + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1462,7 +1471,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -btrfs-progs configure v4.7 +btrfs-progs configure v4.7.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1831,7 +1840,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by btrfs-progs $as_me v4.7, which was +It was created by btrfs-progs $as_me v4.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5360,7 +5369,28 @@ else fi + +# Check whether --with-convert was given. +if test "${with_convert+set}" = set; then : + withval=$with_convert; +else + with_convert=auto + +fi + + +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 + if test "x$with_convert" = "xauto" || echo "$with_convert" | grep -q "ext2"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXT2FS" >&5 @@ -5709,6 +5739,20 @@ else $as_echo "yes" >&6; } fi + convertfs="${convertfs:+$convertfs,}ext2" + BTRFSCONVERT_EXT2=1 + fi +fi + + +# catch typos +tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e 's/,\+/,/') +if ! test "x$tmp" = "x"; then + as_fn_error $? "unknown tokens for --with-convert: $tmp" "$LINENO" 5 +fi + +if test "$DISABLE_BTRFSCONVERT" = 0 && test "x$convertfs" = "x"; then + as_fn_error $? "no filesystems for convert, use --disable-convert instead" "$LINENO" 5 fi @@ -6634,7 +6678,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by btrfs-progs $as_me v4.7, which was +This file was extended by btrfs-progs $as_me v4.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6697,7 +6741,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -btrfs-progs config.status v4.7 +btrfs-progs config.status v4.7.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7426,7 +7470,7 @@ fi documentation: ${enable_documentation} backtrace support: ${enable_backtrace} - btrfs-convert: ${enable_convert} + btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} Type 'make' to compile. " >&5 @@ -7446,7 +7490,7 @@ $as_echo " documentation: ${enable_documentation} backtrace support: ${enable_backtrace} - btrfs-convert: ${enable_convert} + btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} Type 'make' to compile. " >&6; } |