I mistakenly asked for a patch to be included in 404317c270, and it didn't end up applying cleanly. This PR fixes the patching by excluding the problematic file from the patch (`configure`), and then using autoreconfHook to regenerate `configure`.
404317c270