diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-10-18 13:15:59 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-10-18 13:15:59 +0100 |
commit | 74d288e05c2d0cb97186f51049813b3e5b5bb0cd (patch) | |
tree | 4fc213398dc89e053d53ff7d42102942470e9cb5 /configure | |
parent | 569a646293cd782de7665b6158514f3b48d229d3 (diff) |
New upstream release.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 395 |
1 files changed, 360 insertions, 35 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.12. +# Generated by GNU Autoconf 2.69 for btrfs-progs v4.13.3. # # 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.12' -PACKAGE_STRING='btrfs-progs v4.12' +PACKAGE_VERSION='v4.13.3' +PACKAGE_STRING='btrfs-progs v4.13.3' PACKAGE_BUGREPORT='linux-btrfs@vger.kernel.org' PACKAGE_URL='http://btrfs.wiki.kernel.org' @@ -632,6 +632,10 @@ LZO2_CFLAGS LZO2_LIBS_STATIC LZO2_LIBS UDEVDIR +BTRFSRESTORE_ZSTD +ZSTD_LIBS_STATIC +ZSTD_LIBS +ZSTD_CFLAGS ZLIB_LIBS_STATIC ZLIB_LIBS ZLIB_CFLAGS @@ -641,7 +645,10 @@ UUID_CFLAGS BLKID_LIBS_STATIC BLKID_LIBS BLKID_CFLAGS +BTRFSCONVERT_REISERFS BTRFSCONVERT_EXT2 +REISERFS_LIBS +REISERFS_CFLAGS COM_ERR_LIBS COM_ERR_CFLAGS EXT2FS_LIBS @@ -727,6 +734,7 @@ enable_backtrace enable_documentation enable_convert with_convert +enable_zstd ' ac_precious_vars='build_alias host_alias @@ -744,12 +752,16 @@ EXT2FS_CFLAGS EXT2FS_LIBS COM_ERR_CFLAGS COM_ERR_LIBS +REISERFS_CFLAGS +REISERFS_LIBS BLKID_CFLAGS BLKID_LIBS UUID_CFLAGS UUID_LIBS ZLIB_CFLAGS -ZLIB_LIBS' +ZLIB_LIBS +ZSTD_CFLAGS +ZSTD_LIBS' # Initialize some variables set by options. @@ -1290,7 +1302,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.12 to adapt to many kinds of systems. +\`configure' configures btrfs-progs v4.13.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1355,7 +1367,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of btrfs-progs v4.12:";; + short | recursive ) echo "Configuration of btrfs-progs v4.13.3:";; esac cat <<\_ACEOF @@ -1367,13 +1379,14 @@ Optional Features: --disable-backtrace disable btrfs backtrace --disable-documentation do not build domumentation --disable-convert do not build btrfs-convert + --enable-zstd[=auto] build with zstd support (default: auto) 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 + supported (comma separated list): ext2,reiserfs Some influential environment variables: CC C compiler command @@ -1396,6 +1409,10 @@ Some influential environment variables: C compiler flags for COM_ERR, overriding pkg-config COM_ERR_LIBS linker flags for COM_ERR, overriding pkg-config + REISERFS_CFLAGS + C compiler flags for REISERFS, overriding pkg-config + REISERFS_LIBS + linker flags for REISERFS, overriding pkg-config BLKID_CFLAGS C compiler flags for BLKID, overriding pkg-config BLKID_LIBS linker flags for BLKID, overriding pkg-config @@ -1403,6 +1420,8 @@ Some influential environment variables: UUID_LIBS linker flags for UUID, overriding pkg-config ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config ZLIB_LIBS linker flags for ZLIB, overriding pkg-config + ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config + ZSTD_LIBS linker flags for ZSTD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1471,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -btrfs-progs configure v4.12 +btrfs-progs configure v4.13.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1840,7 +1859,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.12, which was +It was created by btrfs-progs $as_me v4.13.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5389,6 +5408,7 @@ fi convertfs= 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 @@ -5742,11 +5762,180 @@ fi convertfs="${convertfs:+$convertfs,}ext2" BTRFSCONVERT_EXT2=1 fi + if test "x$with_convert" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REISERFS" >&5 +$as_echo_n "checking for REISERFS... " >&6; } + +if test -n "$REISERFS_CFLAGS"; then + pkg_cv_REISERFS_CFLAGS="$REISERFS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"reiserfscore >= 3.6.27\""; } >&5 + ($PKG_CONFIG --exists --print-errors "reiserfscore >= 3.6.27") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_REISERFS_CFLAGS=`$PKG_CONFIG --cflags "reiserfscore >= 3.6.27" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$REISERFS_LIBS"; then + pkg_cv_REISERFS_LIBS="$REISERFS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"reiserfscore >= 3.6.27\""; } >&5 + ($PKG_CONFIG --exists --print-errors "reiserfscore >= 3.6.27") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_REISERFS_LIBS=`$PKG_CONFIG --libs "reiserfscore >= 3.6.27" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + REISERFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "reiserfscore >= 3.6.27" 2>&1` + else + REISERFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "reiserfscore >= 3.6.27" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$REISERFS_PKG_ERRORS" >&5 + + BTRFSCONVERT_REISERFS=0 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + BTRFSCONVERT_REISERFS=0 +else + REISERFS_CFLAGS=$pkg_cv_REISERFS_CFLAGS + REISERFS_LIBS=$pkg_cv_REISERFS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + BTRFSCONVERT_REISERFS=1 +fi + elif echo "$with_convert" | grep -q "reiserfs"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REISERFS" >&5 +$as_echo_n "checking for REISERFS... " >&6; } + +if test -n "$REISERFS_CFLAGS"; then + pkg_cv_REISERFS_CFLAGS="$REISERFS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"reiserfscore >= 3.6.27\""; } >&5 + ($PKG_CONFIG --exists --print-errors "reiserfscore >= 3.6.27") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_REISERFS_CFLAGS=`$PKG_CONFIG --cflags "reiserfscore >= 3.6.27" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$REISERFS_LIBS"; then + pkg_cv_REISERFS_LIBS="$REISERFS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"reiserfscore >= 3.6.27\""; } >&5 + ($PKG_CONFIG --exists --print-errors "reiserfscore >= 3.6.27") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_REISERFS_LIBS=`$PKG_CONFIG --libs "reiserfscore >= 3.6.27" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + REISERFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "reiserfscore >= 3.6.27" 2>&1` + else + REISERFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "reiserfscore >= 3.6.27" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$REISERFS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (reiserfscore >= 3.6.27) were not met: + +$REISERFS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables REISERFS_CFLAGS +and REISERFS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables REISERFS_CFLAGS +and REISERFS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + REISERFS_CFLAGS=$pkg_cv_REISERFS_CFLAGS + REISERFS_LIBS=$pkg_cv_REISERFS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + BTRFSCONVERT_REISERFS=1 +fi + fi + if test "$BTRFSCONVERT_REISERFS" = 1; then + convertfs="${convertfs:+$convertfs,}reiserfs" + fi +fi + # catch typos -tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e 's/,\+/,/') +tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e 's/reiserfs//' | sed -e 's/,\+//') if ! test "x$tmp" = "x"; then as_fn_error $? "unknown tokens for --with-convert: $tmp" "$LINENO" 5 fi @@ -6119,6 +6308,141 @@ fi fi +# Check whether --enable-zstd was given. +if test "${enable_zstd+set}" = set; then : + enableval=$enable_zstd; +else + enable_zstd=auto + +fi + + +if test "x$enable_zstd" = xauto; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzstd >= 1.0.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + enable_zstd=yes +else + enable_zstd=no +fi +fi + +if test "x$enable_zstd" = xyes; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD" >&5 +$as_echo_n "checking for ZSTD... " >&6; } + +if test -n "$ZSTD_CFLAGS"; then + pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzstd >= 1.0.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZSTD_CFLAGS=`$PKG_CONFIG --cflags "libzstd >= 1.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ZSTD_LIBS"; then + pkg_cv_ZSTD_LIBS="$ZSTD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzstd >= 1.0.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 1.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzstd >= 1.0.0" 2>&1` + else + ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzstd >= 1.0.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ZSTD_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libzstd >= 1.0.0) were not met: + +$ZSTD_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ZSTD_CFLAGS +and ZSTD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ZSTD_CFLAGS +and ZSTD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS + ZSTD_LIBS=$pkg_cv_ZSTD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + if { { $as_echo "$as_me:${as_lineno-$LINENO}: pkg-config --exists --print-errors \"libzstd\""; } >&5 + (pkg-config --exists --print-errors "libzstd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + ZSTD_LIBS_STATIC=`pkg-config --libs --static "libzstd"` + + else + as_fn_error $? "pkg-config description of libzstd, needed for static build, is not available" "$LINENO" 5 + fi + +fi + +if test "x$enable_zstd" = xyes; then : + BTRFSRESTORE_ZSTD=1 +else + BTRFSRESTORE_ZSTD=0 +fi + + # udev v190 introduced the btrfs builtin and a udev rule to use it. # Our udev rule gives us the friendly dm names but isn't required (or valid) # on earlier releases. @@ -6697,7 +7021,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.12, which was +This file was extended by btrfs-progs $as_me v4.13.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6760,7 +7084,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.12 +btrfs-progs config.status v4.13.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7476,41 +7800,42 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PACKAGE_NAME} ${PACKAGE_VERSION} - prefix: ${prefix} - exec prefix: ${exec_prefix} + prefix: ${prefix} + exec prefix: ${exec_prefix} - bindir: ${bindir} - libdir: ${libdir} - includedir: ${includedir} + bindir: ${bindir} + libdir: ${libdir} + includedir: ${includedir} - compiler: ${CC} - cflags: ${CFLAGS} - ldflags: ${LDFLAGS} + compiler: ${CC} + cflags: ${CFLAGS} + ldflags: ${LDFLAGS} - documentation: ${enable_documentation} - backtrace support: ${enable_backtrace} - btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} + documentation: ${enable_documentation} + backtrace support: ${enable_backtrace} + btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} + btrfs-restore zstd: ${enable_zstd} Type 'make' to compile. " >&5 $as_echo " ${PACKAGE_NAME} ${PACKAGE_VERSION} - prefix: ${prefix} - exec prefix: ${exec_prefix} + prefix: ${prefix} + exec prefix: ${exec_prefix} - bindir: ${bindir} - libdir: ${libdir} - includedir: ${includedir} + bindir: ${bindir} + libdir: ${libdir} + includedir: ${includedir} - compiler: ${CC} - cflags: ${CFLAGS} - ldflags: ${LDFLAGS} + compiler: ${CC} + cflags: ${CFLAGS} + ldflags: ${LDFLAGS} - documentation: ${enable_documentation} - backtrace support: ${enable_backtrace} - btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} + documentation: ${enable_documentation} + backtrace support: ${enable_backtrace} + btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)} + btrfs-restore zstd: ${enable_zstd} Type 'make' to compile. " >&6; } - |