Fix typo.
Put back some gettext m4 macros because autoreconf won't always find them.
Do not add more scripts from m4/.
Fix conflict.