[libvirt] [PATCH 1/2] Don't make it possible to define HAVE_HAL but not enable it in automake.

[Daniel P. Berrange]

On Thu, Dec 17, 2009 at 10:56:24PM +0100, Diego Elio 'Flameeyes' Petten? wrote:
> With the previous logic, if libhal_get_all_devices function was not found,
> HAVE_HAL would be defined for the preprocessor but it wouldn't be enabled
> in automake conditionals, causing the final link to fail with missing
> references to HAL entries.
> ---
>  configure.in |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.in b/configure.in
> index c86ee97..e2a0b00 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -1703,9 +1703,6 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then
>      fi
>    ])
>    if test "x$with_hal" = "xyes" ; then
> -    AC_DEFINE_UNQUOTED([HAVE_HAL], 1,
> -      [use HAL for host device enumeration])
> -
>      old_CFLAGS=$CFLAGS
>      old_LDFLAGS=$LDFLAGS
>      CFLAGS="$CFLAGS $HAL_CFLAGS"
> @@ -1715,6 +1712,10 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then
>      CFLAGS="$old_CFLAGS"
>      LDFLAGS="$old_LDFLAGS"
>    fi
> +  if test "x$with_hal" = "xyes" ; then
> +    AC_DEFINE_UNQUOTED([HAVE_HAL], 1,
> +      [use HAL for host device enumeration])
> +  fi
>  fi
>  AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"])
>  AC_SUBST([HAL_CFLAGS])

ACK


Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|