* reverting [23201], part 2, as current m4 files obviously are not compatible with older gettext releases (should have been part of [23368]