Please apply 4/5. This removes the ability to conditionally compile the SHAPE extension. Rational -- no-one has built the X server without SHAPE for many years; the likelyhood of this completely untested code being mystically broken is high. -keith