btrfs-progs: tests: add helper to log pipe stdout

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

diff --git a/configure.ac b/configure.ac
index 3afcdb4..46f22a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])])
 
@@ -55,8 +56,8 @@ dnl
 dnl Calls pkg-config --static
 dnl
 AC_DEFUN([PKG_STATIC], [
-  if AC_RUN_LOG([pkg-config --exists --print-errors "$2"]); then
-    $1=`pkg-config --libs --static "$2"`
+  if AC_RUN_LOG([${PKG_CONFIG} --exists --print-errors "$2"]); then
+    $1=`${PKG_CONFIG} --libs --static "$2"`
     AC_SUBST([$1])
   else
     AC_MSG_ERROR([pkg-config description of $2, needed for static build, is not available])
@@ -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]),
@@ -199,8 +214,8 @@ AC_SUBST(BTRFSRESTORE_ZSTD)
 # Our udev rule gives us the friendly dm names but isn't required (or valid)
 # on earlier releases.
 UDEVDIR=
-if pkg-config udev --atleast-version 190; then
-       UDEVDIR="$(pkg-config udev --variable=udevdir)"
+if ${PKG_CONFIG} udev --atleast-version 190; then
+       UDEVDIR="$(${PKG_CONFIG} udev --variable=udevdir)"
 fi
 AC_SUBST(UDEVDIR)
 
@@ -246,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}