Compile error building xf86-input-keyboard from current git

[Alex Villací­s Lasso]

Alan Coopersmith escribió:
> Alex Villací­s Lasso wrote:
>   
>> kbd.c:154: error: 'XKB_DFLT_RULES' undeclared here (not in a function)
>>
>> This is from a recent git pulled this morning. I am pulling the changes 
>> from the last few hours, in the hope this is fixed by compiling an 
>> updated proto somewhere.
>>     
>
> The xorg-server.h file installed by the Xorg server build should define
> either __XKBDEFRULES__ (Xorg git prior to this week) or XKB_DFLT_RULES
> (current Xorg git).   The kbd driver as of yesterday's git checkout
> should be accepting either one:
>
> #if !defined(XKB_DFLT_RULES) && defined(__XKBDEFRULES__)
> # define XKB_DFLT_RULES __XKBDEFRULES__
> #endif
>
>   
My build is not defining either. I am building with the 
util/modular/build.sh script included in the git tree.

In the installation dir:

[alex at srv64 xserver]$ grep -r __XKBDEFRULES__ include/
include/xorg/xorg-server.h:/* #undef __XKBDEFRULES__ */
[alex at srv64 xserver]$ grep -r XKB_DFLT_RULES include/
[alex at srv64 xserver]$


My xserver checkout is with current git master.

-- 
perl -e '$x=2.4;print sprintf("%.0f + %.0f = %.0f\n",$x,$x,$x+$x);'