# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1197305648 28800 # Node ID 70e9f11ed6d3ea63b342c4c3de68cc948d7c1cfd # Parent 999e44674d82ed1351303ac73740cb61aa77bedf Fixes to header includes for configure changes Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r 999e44674d82 -r 70e9f11ed6d3 libxkutil/cs_util_instance.c --- a/libxkutil/cs_util_instance.c Mon Dec 10 08:54:06 2007 -0800 +++ b/libxkutil/cs_util_instance.c Mon Dec 10 08:54:08 2007 -0800 @@ -31,7 +31,7 @@ #include <cmpimacs.h> #include "cs_util.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> int get_domain_list(virConnectPtr conn, virDomainPtr **_list) { diff -r 999e44674d82 -r 70e9f11ed6d3 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Dec 10 08:54:06 2007 -0800 +++ b/libxkutil/device_parsing.c Mon Dec 10 08:54:08 2007 -0800 @@ -28,7 +28,7 @@ #include <libxml/parser.h> #include <libxml/xpath.h> -#include <libcmpiutil.h> +#include <libcmpiutil/libcmpiutil.h> #include "device_parsing.h" #include "xmlgen.h" diff -r 999e44674d82 -r 70e9f11ed6d3 libxkutil/misc_util.c --- a/libxkutil/misc_util.c Mon Dec 10 08:54:06 2007 -0800 +++ b/libxkutil/misc_util.c Mon Dec 10 08:54:08 2007 -0800 @@ -32,8 +32,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "cs_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 libxkutil/misc_util.h --- a/libxkutil/misc_util.h Mon Dec 10 08:54:06 2007 -0800 +++ b/libxkutil/misc_util.h Mon Dec 10 08:54:08 2007 -0800 @@ -31,8 +31,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include <libcmpiutil.h> -#include <std_association.h> +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> /* Check if the provider is reponsible for the given class: * e.g. Xen is running on the system and KVM_... is asked for, diff -r 999e44674d82 -r 70e9f11ed6d3 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Mon Dec 10 08:54:06 2007 -0800 +++ b/libxkutil/xmlgen.c Mon Dec 10 08:54:08 2007 -0800 @@ -29,7 +29,7 @@ #ifndef TEST #include "misc_util.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "cmpimacs.h" #endif diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_AllocationCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -25,8 +25,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ComputerSystem.c Mon Dec 10 08:54:08 2007 -0800 @@ -28,13 +28,13 @@ #include <cmpift.h> #include <cmpimacs.h> -#include <libvirt.h> +#include <libvirt/libvirt.h> #include "cs_util.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_invokemethod.h" -#include "std_instance.h" +#include <libcmpiutil/std_invokemethod.h> +#include <libcmpiutil/std_instance.h> #include "Virt_ComputerSystem.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ComputerSystemIndication.c Mon Dec 10 08:54:08 2007 -0800 @@ -32,9 +32,9 @@ #include <libvirt/libvirt.h> -#include <libcmpiutil.h> +#include <libcmpiutil/libcmpiutil.h> #include <misc_util.h> -#include <std_indication.h> +#include <libcmpiutil/std_indication.h> #include <cs_util.h> #include "config.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_Device.c --- a/src/Virt_Device.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_Device.c Mon Dec 10 08:54:08 2007 -0800 @@ -29,8 +29,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "cs_util.h" #include "misc_util.h" #include "device_parsing.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_DevicePool.c Mon Dec 10 08:54:08 2007 -0800 @@ -38,8 +38,8 @@ #include "hostres.h" #include "device_parsing.h" -#include <libcmpiutil.h> -#include <std_instance.h> +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "Virt_DevicePool.h" #include "svpc_types.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_DevicePool.h --- a/src/Virt_DevicePool.h Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_DevicePool.h Mon Dec 10 08:54:08 2007 -0800 @@ -22,8 +22,8 @@ #define __VIRT_DEVICE_POOL_H #include <cmpidt.h> -#include <libvirt.h> -#include <libcmpiutil.h> +#include <libvirt/libvirt.h> +#include <libcmpiutil/libcmpiutil.h> #include <stdint.h> extern char *device_pool_names[]; diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ElementAllocatedFromPool.c --- a/src/Virt_ElementAllocatedFromPool.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ElementAllocatedFromPool.c Mon Dec 10 08:54:08 2007 -0800 @@ -27,8 +27,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "cs_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ElementCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -28,9 +28,9 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_association.h" +#include <libcmpiutil/std_association.h> #include "Virt_VirtualSystemManagementCapabilities.h" #include "Virt_EnabledLogicalElementCapabilities.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ElementConformsToProfile.c Mon Dec 10 08:54:08 2007 -0800 @@ -29,10 +29,10 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" #include "profiles.h" -#include "std_association.h" +#include <libcmpiutil/std_association.h> #include "config.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ElementSettingData.c --- a/src/Virt_ElementSettingData.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ElementSettingData.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "Virt_VSSD.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_EnabledLogicalElementCapabilities.c --- a/src/Virt_EnabledLogicalElementCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_EnabledLogicalElementCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" #include "cs_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_HostSystem.c --- a/src/Virt_HostSystem.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_HostSystem.c Mon Dec 10 08:54:08 2007 -0800 @@ -27,8 +27,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_HostedDependency.c --- a/src/Virt_HostedDependency.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_HostedDependency.c Mon Dec 10 08:54:08 2007 -0800 @@ -27,8 +27,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "Virt_ComputerSystem.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_HostedResourcePool.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,11 +26,11 @@ #include<cmpift.h> #include<cmpimacs.h> -#include <libvirt.h> +#include <libvirt/libvirt.h> -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_association.h" +#include <libcmpiutil/std_association.h> #include "Virt_HostSystem.h" #include "Virt_DevicePool.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_HostedService.c --- a/src/Virt_HostedService.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_HostedService.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "Virt_HostSystem.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_RASD.c --- a/src/Virt_RASD.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_RASD.c Mon Dec 10 08:54:08 2007 -0800 @@ -28,8 +28,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include <libcmpiutil.h> -#include <std_instance.h> +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "device_parsing.h" #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_RegisteredProfile.c --- a/src/Virt_RegisteredProfile.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_RegisteredProfile.c Mon Dec 10 08:54:08 2007 -0800 @@ -29,8 +29,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "cs_util.h" #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ResourceAllocationFromPool.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "cs_util.h" #include "device_parsing.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ResourcePoolConfigurationCapabilities.c --- a/src/Virt_ResourcePoolConfigurationCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ResourcePoolConfigurationCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_ResourcePoolConfigurationService.c Mon Dec 10 08:54:08 2007 -0800 @@ -22,9 +22,9 @@ #include "cmpift.h" #include "cmpimacs.h" -#include <libcmpiutil.h> -#include <std_invokemethod.h> -#include <std_instance.h> +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_invokemethod.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,7 +26,7 @@ #include <sys/vfs.h> #include <errno.h> -#include <libvirt.h> +#include <libvirt/libvirt.h> #include "config.h" @@ -34,9 +34,9 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_association.h" +#include <libcmpiutil/std_association.h> #include "device_parsing.h" #include "svpc_types.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_SettingsDefineState.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "device_parsing.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_SystemDevice.c Mon Dec 10 08:54:08 2007 -0800 @@ -29,11 +29,11 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "device_parsing.h" #include "misc_util.h" #include "cs_util.h" -#include "std_association.h" +#include <libcmpiutil/std_association.h> #include "Virt_ComputerSystem.h" #include "Virt_Device.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VSMigrationCapabilities.c --- a/src/Virt_VSMigrationCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VSMigrationCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,9 +26,9 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_instance.h" +#include <libcmpiutil/std_instance.h> #include "Virt_VSMigrationCapabilities.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VSMigrationService.c Mon Dec 10 08:54:08 2007 -0800 @@ -22,16 +22,16 @@ #include <stdlib.h> #include <string.h> -#include <libvirt.h> +#include <libvirt/libvirt.h> #include <cmpidt.h> #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" +#include <libcmpiutil/libcmpiutil.h> #include "misc_util.h" -#include "std_instance.h" -#include "std_invokemethod.h" +#include <libcmpiutil/std_instance.h> +#include <libcmpiutil/std_invokemethod.h> #include "Virt_VSMigrationService.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VSSD.c Mon Dec 10 08:54:08 2007 -0800 @@ -27,8 +27,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "cs_util.h" #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VSSDComponent.c --- a/src/Virt_VSSDComponent.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VSSDComponent.c Mon Dec 10 08:54:08 2007 -0800 @@ -25,8 +25,8 @@ #include "cmpift.h" #include "cmpimacs.h" -#include "libcmpiutil.h" -#include "std_association.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> #include "misc_util.h" #include "device_parsing.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VirtualSystemManagementCapabilities.c --- a/src/Virt_VirtualSystemManagementCapabilities.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VirtualSystemManagementCapabilities.c Mon Dec 10 08:54:08 2007 -0800 @@ -26,8 +26,8 @@ #include <cmpift.h> #include <cmpimacs.h> -#include "libcmpiutil.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Dec 10 08:54:06 2007 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Mon Dec 10 08:54:08 2007 -0800 @@ -35,10 +35,10 @@ #include "device_parsing.h" #include "xmlgen.h" -#include "libcmpiutil.h" -#include "std_invokemethod.h" -#include "std_indication.h" -#include "std_instance.h" +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_invokemethod.h> +#include <libcmpiutil/std_indication.h> +#include <libcmpiutil/std_instance.h> #include "misc_util.h" diff -r 999e44674d82 -r 70e9f11ed6d3 src/svpc_types.h --- a/src/svpc_types.h Mon Dec 10 08:54:06 2007 -0800 +++ b/src/svpc_types.h Mon Dec 10 08:54:08 2007 -0800 @@ -32,7 +32,7 @@ /* Vendor-specific extension; should be documented somewhere */ #define CIM_VSSD_RECOVERY_PRESERVE 123 -#include <libcmpiutil.h> +#include <libcmpiutil/libcmpiutil.h> #include <string.h> static inline char *vssd_recovery_action_str(int action)