As it doesn't have any good reason not to, please make d4x rebuild autotools rather than patching the extra files.
*** This bug has been marked as a duplicate of bug 226801 ***