configure: fix post-merge errors