[libvirt] [PATCH v4 08/11] CPU selection infrastructure

[Matthias Bolte]

2009/12/22 Daniel P. Berrange <berrange at redhat.com>:
> On Thu, Dec 17, 2009 at 09:21:42PM +0100, Jiri Denemark wrote:
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index 432a66e..471e403 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -16,6 +16,7 @@ INCLUDES =                                                  \
>>               -DSBINDIR=\""$(sbindir)"\"                      \
>>               -DSYSCONF_DIR="\"$(sysconfdir)\""               \
>>               -DLOCALEBASEDIR=\""$(datadir)/locale"\"         \
>> +             -DDATADIR=\""$(datadir)/libvirt"\"              \
>>               -DLOCAL_STATE_DIR=\""$(localstatedir)"\"        \
>>               -DGETTEXT_PACKAGE=\"$(PACKAGE)\"                \
>>               $(WARN_CFLAGS)                                  \
>
>
> This patch has unfortuntely broken the build on Win32, because of a
> lovely datatype in Win32 objidl.h header file which is included from
> the winsock headers:
>
> typedef enum tagDATADIR {
>        DATADIR_GET=1,
>        DATADIR_SET
> } DATADIR;
>
>
> So, this makefile.am constant will need to be renamed, and similarly the
> code using it :-(
>
> Daniel

I noticed that as well. You can stop it including objidl.h by adding
-DNOGDI to the CFLAGS.

Matthias