Updated devel-m4 patch to work around gnulib nonsense.