sync to safemode branch -r12384, fix dumb autoconf config.h so that it only gets included once
Authored by: safemode 2008-07-05
Parent: [r12384]
Child: [r12386]