Compile error building xf86-input-keyboard from current git

[Alan Coopersmith]

Alex Villací­s Lasso wrote:
> 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.

I actually hadn't pushed the fix for that until shortly after sending
that message yesterday (oops!)  but git master now has:

alanc at alf:/export/alanc/X.org/mod/git/xserver [9:02am - 218] grep
__XKBDEFRULES__ include/*
alanc at alf:/export/alanc/X.org/mod/git/xserver [9:02am - 219] grep XKB_DFLT_RULES
include/*
include/xkb-config.h.in:#undef XKB_DFLT_RULES
include/xorg-server.h.in:#undef XKB_DFLT_RULES

If you don't see XKB_DFLT_RULES at all, you're several days behind
git master, or on a different branch than master.

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering