I noticed that lib-src and src were solving the same problem in two 
different ways, which can't be right, so I applied the attached further 
patch to make it consistent, as emacs-24 bzr 117055.