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

[Richard W.M. Jones]

On Fri, Aug 27, 2021 at 04:47:24PM +0200, Alexandre Iooss wrote:
> 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.

Thanks - I've pushed it.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW