changes needed to make hott and ProofGeneral build under Debian 6.0 with emacs 23.2; may break it for other systems
... part 2 (?)