X11/extensions/Xagsrv.h + XKB_IN_SERVER redefined

[Ron Wezeman]

X works with git checkout master:

-bash-3.1$ grep MOD_ util/modular/build.sh
        MOD_SPECIFIC=" --disable-xgl --enable-xorg --disable-xprint
--disable-glx --enable-dri --disable-dmx --enable-xvfb --disable-xnest
--disable-xglx --enable-xkb --disable-kdriveserver "
-bash-3.1$ 

Now CONFIGURE:
cd ./xserver && \
git checkout xgl-0-0-1 && \
make maintainer-clean && \
./autogen.sh --enable-xgl --disable-xorg --disable-xprint --enable-glx
--enable-dri --disable-dmx --enable-xvfb --disable-xnest --enable-xglx
--disable-xkb --disable-kdriveserver --prefix=/XX

With ENVIRONMENT:

-bash-3.1$ env    
ACLOCAL=aclocal -I /XX/share/aclocal -I /usr/share/aclocal
-I /share/aclocal 
LD_LIBRARY_PATH=/XX/lib:/usr/lib:/lib
PATH=/XX/bin:/usr/bin:/bin
PKG_CONFIG_PATH=/XX/lib/pkgconfig:/usr/lib/pkgconfig:/lib/pkgconfig
_=/usr/bin/env
-bash-3.1$

the next error:

 gcc -DHAVE_CONFIG_H -I. -I. -I../include -I../include -I../include
-I../include -I../include -I../include -I../include -I../include
-I../Xprint -DHAVE_DIX_CONFIG_H -DXGLServer "-DVENDOR_STRING=\"The X.Org
Foundation\"" "-DVENDOR_RELEASE=(((7) * 10000000) + ((0) * 100000) +
((0) * 1000) + 0)" -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
-I/XX/include -I../include -I../include -I../Xext -I../composite
-I../damageext -I../xfixes -I../Xi -I../mi -I../miext/shadow
-I../miext/damage -I../render -I../randr -I../fb -g -O2 -MT dispatch.lo
-MD -MP -MF .deps/dispatch.Tpo -c dispatch.c  -fPIC -DPIC
-o .libs/dispatch.o
dispatch.c:115:35: error: X11/extensions/Xagsrv.h: No such file or
directory
dispatch.c:118:1: warning: "XKB_IN_SERVER" redefined
In file included from dispatch.c:82:
../include/dix-config.h:346:1: warning: this is the location of the
previous definition
make[1]: *** [dispatch.lo] Error 1
make[1]: Leaving directory `xorg/xserver/dix'
make: *** [all-recursive] Error 1
-bash-3.1$ 

Xagsrv.h is not found in git.

Regards,

Ron Wezeman