[libvirt] [PATCH 3/3] Backed out HAL changes after removing HAL code from scsi backend.

[Daniel P. Berrange]

On Mon, Mar 02, 2009 at 02:41:13PM -0500, David Allan wrote:
> ---
>  configure.in    |    2 +-
>  src/Makefile.am |    1 -
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.in b/configure.in
> index b88a7d5..995fac5 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -1168,7 +1168,7 @@ LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.}
>  AC_SUBST([LV_LIBTOOL_OBJDIR])
>  
>  dnl HAL or DeviceKit library for host device enumeration
> -HAL_REQUIRED=0.5.0
> +HAL_REQUIRED=0.0
>  HAL_CFLAGS=
>  HAL_LIBS=
>  AC_ARG_WITH([hal],

I think you can leave out this chunk - we should have used 0.5.0 in the
first place, so no need to remove it now.

> diff --git a/src/Makefile.am b/src/Makefile.am
> index f1dd789..88f82db 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -9,7 +9,6 @@ INCLUDES = \
>  	   $(XEN_CFLAGS) \
>  	   $(SELINUX_CFLAGS) \
>  	   $(DRIVER_MODULE_CFLAGS) \
> -	   $(POLKIT_CFLAGS) \
>  	   -DLIBDIR=\""$(libdir)"\" \
>  	   -DBINDIR=\""$(libexecdir)"\" \
>  	   -DSBINDIR=\""$(sbindir)"\" \

ACK to this, since its redundant change added by the first patch


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 :|