Pino Toscano
2020-Jan-15 14:38 UTC
[Libguestfs] [PATCH] build: define HAVE_PYCODESTYLE in all the cases
Fixes commit cad3ea9e74bcff0dd42dc2a3710c6b3fa6e868b1 in case Python is
disabled, or not available.
---
m4/guestfs-python.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/m4/guestfs-python.m4 b/m4/guestfs-python.m4
index 505eba5df..2e736875c 100644
--- a/m4/guestfs-python.m4
+++ b/m4/guestfs-python.m4
@@ -88,7 +88,6 @@ AS_IF([test "x$enable_python" != "xno"],[
AC_MSG_RESULT([$PYTHON_EXT_SUFFIX])
AC_CHECK_PROGS([PYCODESTYLE],[pycodestyle],[no])
- AM_CONDITIONAL([HAVE_PYCODESTYLE], [test "x$PYCODESTYLE" !=
"xno"])
fi
AC_SUBST(PYTHON_PREFIX)
@@ -98,3 +97,5 @@ AS_IF([test "x$enable_python" != "xno"],[
])
AM_CONDITIONAL([HAVE_PYTHON],
[test "x$PYTHON" != "xno" && test
"x$have_python_module" = "x1" ])
+AM_CONDITIONAL([HAVE_PYCODESTYLE],
+ [test -n "$PYCODESTYLE" && test "x$PYCODESTYLE"
!= "xno"])
--
2.24.1
Richard W.M. Jones
2020-Jan-16 09:11 UTC
Re: [Libguestfs] [PATCH] build: define HAVE_PYCODESTYLE in all the cases
On Wed, Jan 15, 2020 at 03:38:10PM +0100, Pino Toscano wrote:> Fixes commit cad3ea9e74bcff0dd42dc2a3710c6b3fa6e868b1 in case Python is > disabled, or not available. > --- > m4/guestfs-python.m4 | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/m4/guestfs-python.m4 b/m4/guestfs-python.m4 > index 505eba5df..2e736875c 100644 > --- a/m4/guestfs-python.m4 > +++ b/m4/guestfs-python.m4 > @@ -88,7 +88,6 @@ AS_IF([test "x$enable_python" != "xno"],[ > AC_MSG_RESULT([$PYTHON_EXT_SUFFIX]) > > AC_CHECK_PROGS([PYCODESTYLE],[pycodestyle],[no]) > - AM_CONDITIONAL([HAVE_PYCODESTYLE], [test "x$PYCODESTYLE" != "xno"]) > fi > > AC_SUBST(PYTHON_PREFIX) > @@ -98,3 +97,5 @@ AS_IF([test "x$enable_python" != "xno"],[ > ]) > AM_CONDITIONAL([HAVE_PYTHON], > [test "x$PYTHON" != "xno" && test "x$have_python_module" = "x1" ]) > +AM_CONDITIONAL([HAVE_PYCODESTYLE], > + [test -n "$PYCODESTYLE" && test "x$PYCODESTYLE" != "xno"]) > -- > 2.24.1ACK Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v