Libguestfs - Jun 2020 - [PATCH nbdkit v2 0/3] build: Rename configure --without-linuxdisk -> --disable-linuxdisk

This time it should hopefully work.  I tested all 3 combinations:

  autoconf
  ./configure [--disable-linuxdisk | --enable-linuxdisk | <nothing> ]
  make clean && make && make check

and they all appear to do the right thing.

Rich.

This test failed if mke2fs was too old to have the -d option (or
mke2fs was not installed at all), which means that the test disk was
not created.  Skip the test instead of failing in this case.
---
 tests/test-ssh.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test-ssh.sh b/tests/test-ssh.sh
index 8f3b9e5b..efc06c07 100755
--- a/tests/test-ssh.sh
+++ b/tests/test-ssh.sh
@@ -34,6 +34,7 @@ source ./functions.sh
 set -e
 set -x
 
+requires test -f disk
 requires sshd -t -f ssh/sshd_config
 requires qemu-img --version
 requires cut --version
-- 
2.25.0

On platforms where mke2fs was too old to have the -d option (or mke2fs
was not installed at all) this plugin was disabled.  However we did
not print that fact in the ./configure summary.
---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index e6ca09de..7c15ed0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1196,6 +1196,8 @@ feature "iso ....................................
" \
         test "x$HAVE_ISO_TRUE" = "x"
 feature "libvirt ................................ " \
         test "x$HAVE_LIBVIRT_TRUE" = "x"
+feature "linuxdisk .............................. " \
+        test "x$HAVE_MKE2FS_WITH_D_TRUE" = "x"
 feature "nbd .................................... " \
         test "x$HAVE_LIBNBD_TRUE" = "x"
 feature "ssh .................................... " \
-- 
2.25.0

When I was reviewing this I forgot the faintly ridiculous rules that
autoconf uses for --enable/disable vs --with/without:

 
https://www.gnu.org/software/autoconf/manual/autoconf-2.66/html_node/Package-Options.html
 
https://www.gnu.org/software/autoconf/manual/autoconf-2.66/html_node/External-Software.html

Since this is disabling an intrinsic feature of the software (a
plugin) it should use --disable.

Updates: commit 2a3efc5836df3d55d304cc4b3ea2800b5e93831a
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7c15ed0f..3cbbeb9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,17 +483,17 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[
     LIBS="$old_LIBS"
 ])
 
-AC_ARG_WITH([linuxdisk],
-    [AS_HELP_STRING([--without-linuxdisk],
+AC_ARG_ENABLE([linuxdisk],
+    [AS_HELP_STRING([--disable-linuxdisk],
                     [disable linuxdisk plugin @<:@default=check@:>@])],
     [],
-    [with_linuxdisk=check])
+    [enable_linuxdisk=check])
 dnl Check for mke2fs -d (used by linuxdisk plugin).  There are two
 dnl possible outcomes that we care about: (1) We have mke2fs and
 dnl it supports the -d option.  (2) We either don't have mke2fs
 dnl or it's too old to support the -d option (eg. on RHEL 7).
 mke2fs_with_d=no
-AS_IF([test "$with_linuxdisk" != "no"], [
+AS_IF([test "$enable_linuxdisk" != "no"], [
     AC_MSG_CHECKING([for mke2fs supporting the -d option])
     AS_IF([mke2fs -V >/dev/null 2>&1], [
         AS_IF([LANG=C mke2fs -d 2>&1 | grep -sq "option requires an
argument"], [
-- 
2.25.0