compile error with recent dbus svn code

[Ralf Habacker]

Jaroslaw Staniek schrieb:
> Ralf Habacker said the following, On 2008-07-12 11:32:
>   
>> Hi,
>>
>> I'm trying to compile dbus from recent svn sources running emerge 
>> --buildtype=Debug --update dbus-src and got the following errors:
>>
>> -- Configuring done
>> -- Generating done
>> -- Build files have been written to: 
>> E:/daten/kde/emerge-msvc-root/tmp/dbus-src-1.1.2.20080216/work/msvc2005-Debug
>> Scanning dependencies of target dbus-1
>> [  0%] Building C object 
>> dbus/CMakeFiles/dbus-1.dir/C_/downloads/kde/svn-src/dbus-src/trunk/dbus/dbus-address.obj
>> dbus-address.c
>> C:\downloads\kde\svn-src\dbus-src\trunk\dbus\dbus-address.c(702) : error 
>> C2065: 'DBUS_ERROR_INIT' : undeclared identifier
>> C:\downloads\kde\svn-src\dbus-src\trunk\dbus\dbus-address.c(702) : error 
>> C2440: 'initializing' : cannot convert from 'int' to 'DBusError'
>> NMAKE : fatal error U1077: 'C:\PROGRA~1\MID05A~1\VC\bin\cl.exe' : return 
>> code '0x2'
>>
>>     
>
> Please remove (or backup) your original kde4/include/dbus directory before 
> building the one usign emerge. It's a conflict of versions.
>   
Thanks for this pointer - this helped.

The main reason for this behavior is that the installed include dir is 
used before the local include dirs, which is not good in general. The 
local  include dir should be used first.

I cleaned up the related CMakeLists.txt  in trunk svn directly because 
the cmake dir is maintained by the windbus project. Are there any other 
branches to which this fix should be applied too ?

Ralf