btrfs-progs: check: Move imode_to_type function to check/common.h

[platform/upstream/btrfs-progs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index adceafc..3afcdb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([btrfs-progs],
-       m4_esyscmd([./version.sh --configure]),
+       m4_chomp(m4_include([VERSION])),
        [linux-btrfs@vger.kernel.org],,
        [http://btrfs.wiki.kernel.org])
 
@@ -183,14 +183,10 @@ PKG_CHECK_MODULES(ZLIB, [zlib])
 PKG_STATIC(ZLIB_LIBS_STATIC, [zlib])
 
 AC_ARG_ENABLE([zstd],
-       AS_HELP_STRING([--enable-zstd@<:@=auto@:>@], [build with zstd support (default: auto)]),
-       [], [enable_zstd=auto]
+       AS_HELP_STRING([--disable-zstd], [build without zstd support]),
+       [], [enable_zstd=yes]
 )
 
-if test "x$enable_zstd" = xauto; then
-       PKG_CHECK_EXISTS([libzstd >= 1.0.0], [enable_zstd=yes], [enable_zstd=no])
-fi
-
 if test "x$enable_zstd" = xyes; then
        PKG_CHECK_MODULES(ZSTD, [libzstd >= 1.0.0])
        PKG_STATIC(ZSTD_LIBS_STATIC, [libzstd])