Revert "go back to allowing gettext 0.11.5, but don't mix with libtool 2.2"