Building with a gettext 0.21 environment caused various issues: - configure.ac was updated automatically to a newer AM_GNU_GETTEXT_VERSION which is not something you want since it is under revision control. - after a clean clone running make causes this error: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.20 but the autoconf macros are from gettext version 0.19 These two patches fix these issues. Tested with both gettext 0.21 and gettext 0.19.8. Autoconf was at 2.69. Hopefully this will keep working once autoconf is bumped to 2.70.