[Libguestfs] [PATCH] build: Define HAVE_RPM, HAVE_DPKG and HAVE_PACMAN

Alexandre Iooss erdnaxe at crans.org
Fri Aug 27 14:47:24 UTC 2021


When using option `--with-distro`, `HAVE_RPM`, `HAVE_DPKG` and
`HAVE_PACMAN` are not defined and make the configure phase fail.
This makes sure that these conditionals are always defined.
---
 m4/guestfs-appliance.m4 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4
index 8b9ddcb..66aea5f 100644
--- a/m4/guestfs-appliance.m4
+++ b/m4/guestfs-appliance.m4
@@ -114,16 +114,16 @@ AC_ARG_WITH([distro],
             AC_MSG_ERROR([/etc/os-release not available, please specify the distro using --with-distro=DISTRO])
         fi
     ]
-    AM_CONDITIONAL([HAVE_RPM],
-        [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
-                            [*], [false])])
-    AM_CONDITIONAL([HAVE_DPKG],
-        [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
-                            [*], [false])])
-    AM_CONDITIONAL([HAVE_PACMAN],
-        [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true],
-                            [*], [false])])
 )
+AM_CONDITIONAL([HAVE_RPM],
+    [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
+                        [*], [false])])
+AM_CONDITIONAL([HAVE_DPKG],
+    [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
+                        [*], [false])])
+AM_CONDITIONAL([HAVE_PACMAN],
+    [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true],
+                        [*], [false])])
 AC_SUBST([DISTRO])

 dnl Add extra packages to the appliance.
--
2.31.1





More information about the Libguestfs mailing list