X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=56d17c3a4af26e2546703996d766432e2631205d;hb=64a938ff702a5de8117e16cc8b482a57cdeb5990;hp=adceafc3996417309f281040ab49ad4d51faaf7d;hpb=2e5d35409a549c1876bc071f2f369de8ab5df60c;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/configure.ac b/configure.ac
index adceafc..56d17c3 100644
--- 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])
 
@@ -39,6 +39,7 @@ AC_CHECK_TOOL([AR], [ar])
 AC_PATH_PROG([RM], [rm], [rm])
 AC_PATH_PROG([RMDIR], [rmdir], [rmdir])
 
+
 AC_CHECK_FUNCS([openat], [],
 	[AC_MSG_ERROR([cannot find openat() function])])
 
@@ -88,13 +89,27 @@ AS_IF([test "x$enable_documentation" = xyes], [DISABLE_DOCUMENTATION=0], [DISABL
 AC_SUBST([DISABLE_DOCUMENTATION])
 
 dnl detect tools to build documentation
+ASCIIDOC_TOOL="none"
 if test "x$enable_documentation" = xyes; then
-	AC_PATH_PROG([ASCIIDOC], [asciidoc], [asciidoc])
 	AC_PATH_PROG([XMLTO], [xmlto], [xmlto])
 	AC_PATH_PROG([GZIP], [gzip], [gzip])
 	AC_PATH_PROG([MV], [mv], [mv])
 	AC_PROG_SED
+	AC_PATH_PROG([ASCIIDOC], [asciidoc])
+	AC_PATH_PROG([ASCIIDOCTOR], [asciidoctor])
+
+	dnl asciidoc is preferred
+	if test -n "$ASCIIDOC"; then
+		ASCIIDOC_TOOL="asciidoc"
+	else
+		if test -n "$ASCIIDOCTOR"; then
+			ASCIIDOC_TOOL="asciidoctor"
+		else
+			AC_MSG_ERROR([cannot find asciidoc or asciidoctor, cannot build documentation])
+		fi
+	fi
 fi
+AC_SUBST([ASCIIDOC_TOOL])
 
 AC_ARG_ENABLE([convert],
 	      AS_HELP_STRING([--disable-convert], [do not build btrfs-convert]),
@@ -183,14 +198,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])
@@ -250,6 +261,7 @@ AC_MSG_RESULT([
 	ldflags:            ${LDFLAGS}
 
 	documentation:      ${enable_documentation}
+	doc generator:      ${ASCIIDOC_TOOL}
 	backtrace support:  ${enable_backtrace}
 	btrfs-convert:      ${enable_convert} ${convertfs:+($convertfs)}
 	btrfs-restore zstd: ${enable_zstd}