Some brokenness in recent xorg git

[Joel Feiner]

I tried updating my Git check out of Xorg and two packages no longer 
build (xserver and libpciaccess).  Here's what I get for xserver:

../doltcompile gcc -DHAVE_CONFIG_H -I. -I../include 
-DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes 
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs 
-fno-strict-aliasing -Wbad-function-cast -Wold-style-definition 
-Wdeclaration-after-statement -D_BSD_SOURCE -DHAS_FCHOWN 
-DHAS_STICKY_DIR_BIT -DDBUS_API_SUBJECT_TO_CHANGE 
-I/usr/local/xorg/include/pixman-1 -I/usr/include/freetype2 
-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/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 -fvisibility=hidden -DVENDOR_NAME=\""The 
X.Org Foundation"\" -DVENDOR_RELEASE="(((1) * 10000000) + ((6) * 100000) 
+ ((99) * 1000) + 1)" -O2 -fomit-frame-pointer -pipe -mtune=pentium-m 
-march=pentium-m -MT main.lo -MD -MP -MF .deps/main.Tpo -c -o main.lo main.c
main.c:79:28: error: version-config.h: No such file or directory
make[2]: *** [main.lo] Error 1
make[2]: Leaving directory `/usr/local/src/xorg/xserver/dix'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/usr/local/src/xorg/xserver/dix'
make: *** [all-recursive] Error 1

And also this in libpciaccess:

checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
./configure: line 11179: syntax error near unexpected token `PCIIDS_PATH,'
./configure: line 11179: `AC_DEFINE_DIR(PCIIDS_PATH, pciids_path, Path 
to pci.ids)'

It may, of course, be a problem on my end.  I'm using jhbuild to rebuild 
the Xorg tree.  Is there something that changed in some weak dependency 
that I need to update to make all this work?

- Joel