configure: fix post-merge errors
configure: fix post-merge errors

rgrinberg/merlin,haselwarter/merlin,the-lambda-church/merlin,dra27/merlin,fxfactorial/merlin,the-lambda-church/merlin,rgrinberg/merlin,the-lambda-church/merlin,dra27/merlin,dra27/merlin,rgrinberg/merlin,dra27/merlin,chriskonstad/merlin,fxfactorial/merlin,ocaml/merlin,neojski/merlin,chambart/merlin,neojski/merlin,neojski/merlin,fxfactorial/merlin,chriskonstad/merlin,fxfactorial/merlin,neojski/merlin,ocaml/merlin,chambart/merlin,rgrinberg/merlin,haselwarter/merlin,ocaml/merlin,chambart/merlin,chambart/merlin,haselwarter/merlin,haselwarter/merlin,ocaml/merlin