Since we require a version of gettext that might not match the version
installed we need to hack the order of includes for autoreconf.

This hack should go away, and we should just use the installed copy of
gettext.