X.org 7.1 and Mesa 6.5.1 Compile error

[Kenneth Burke]

I am trying to compile X.org 7.1. Accroding to the wiki here:
http://wiki.x.org/wiki/ModularDevelopersGuide#head-7f42426a04edf56ae1919a47ed1daa6d2d124eaf
X11R7.1 will only compile with Mesa 6.5.1, so that's what I'm using.

At first, I was getting errors about missing header files, and had to
make changes to:
/xserver/xorg-server-X11R7.1-1.1.0/GL/symlink-mesa.sh
to add:
bitset.h
arrayobj.h
arrayobj.c
rbadaptors.h
rbadaptors.c
to synlink_mesa_main()

I also had to change:
slang_version.h
to
slang_pp_version.h
in symlink-mesa.sh.

However, when I try to compile, I am now getting the following error:

gcc -DHAVE_DIX_CONFIG_H -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS
-DXFree86Server -Wall -Wpointer-arith -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs
-fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
-I/root/tmp/x.org/modular/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 -o Xvfb InitInput.o
InitOutput.o dpmsstubs.o stubs.o miinitext.o fbcmap.o
../../dix/.libs/libdix.a ../../fb/.libs/libfb.a ../../mi/.libs/libmi.a
../../xfixes/.libs/libxfixes.a ../../Xext/.libs/libXext.a
../../dbe/.libs/libdbe.a ../../XTrap/.libs/libxtrap.a
../../record/.libs/librecord.a ../../GL/glx/.libs/libglx.a
../../GL/mesa/.libs/libGLcore.a ../../render/.libs/librender.a
../../randr/.libs/librandr.a ../../damageext/.libs/libdamageext.a
../../miext/damage/.libs/libdamage.a ../../miext/cw/.libs/libcw.a
../../miext/shadow/.libs/libshadow.a ../../Xi/.libs/libXi.a
../../xkb/.libs/libxkb.a ../../xkb/.libs/libxkbstubs.a
../../composite/.libs/libcomposite.a ../../dix/.libs/libxpstubs.a
../../os/.libs/libcwrapper.a ../../os/.libs/libos.a
-L/root/tmp/x.org/modular/lib /root/tmp/x.org/modular/lib/libXfont.so
/usr/lib/libfreetype.so /root/tmp/x.org/modular/lib/libXau.so
/root/tmp/x.org/modular/lib/libfontenc.so
/root/tmp/x.org/modular/lib/libXdmcp.so -lz -lm -Wl,--rpath
-Wl,/root/tmp/x.org/modular/lib -Wl,--rpath
-Wl,/root/tmp/x.org/modular/lib
../../GL/mesa/.libs/libGLcore.a(driverfuncs.o): In function
`_mesa_init_driver_functions':
drivers/common/driverfuncs.c:225: undefined reference to
`_mesa_new_array_object'
drivers/common/driverfuncs.c:226: undefined reference to
`_mesa_delete_array_object'
../../GL/mesa/.libs/libGLcore.a(context.o): In function `delete_arrayobj_cb':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/context.c:872:
undefined reference to `_mesa_delete_array_object'
../../GL/mesa/.libs/libGLcore.a(context.o): In function
`_mesa_free_context_data':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/context.c:1413:
undefined reference to `_mesa_delete_array_object'
../../GL/mesa/.libs/libGLcore.a(dlist.o): In function `_mesa_init_dlist_table':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/dlist.c:8117:
undefined reference to `_mesa_BindVertexArrayAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/dlist.c:8118:
undefined reference to `_mesa_DeleteVertexArraysAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/dlist.c:8119:
undefined reference to `_mesa_GenVertexArraysAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/dlist.c:8120:
undefined reference to `_mesa_IsVertexArrayAPPLE'
../../GL/mesa/.libs/libGLcore.a(state.o): In function `_mesa_init_exec_table':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/state.c:542:
undefined reference to `_mesa_BindVertexArrayAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/state.c:543:
undefined reference to `_mesa_DeleteVertexArraysAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/state.c:544:
undefined reference to `_mesa_GenVertexArraysAPPLE'
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/state.c:545:
undefined reference to `_mesa_IsVertexArrayAPPLE'
../../GL/mesa/.libs/libGLcore.a(varray.o): In function `_mesa_init_varray':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/varray.c:933:
undefined reference to `_mesa_new_array_object'
../../GL/mesa/.libs/libGLcore.a(attrib.o): In function `_mesa_PopClientAttrib':
/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/GL/mesa/main/attrib.c:1355:
undefined reference to `_mesa_BindVertexArrayAPPLE'
collect2: ld returned 1 exit status
make[3]: *** [Xvfb] Error 1
make[3]: Leaving directory
`/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/hw/vfb'
make[2]: *** [all] Error 2
make[2]: Leaving directory
`/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/hw/vfb'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory
`/root/tmp/x.org/tarballs/xserver/xorg-server-X11R7.1-1.1.0/hw'
make: *** [all-recursive] Error 1

I haven't been able to find anything on this. Any ideas/pointers?

Thanks,
--Kenneth A. Burke