check for camlp4 presence and version in configure

fixes issue #431
Do not remove the lock when it has not been locked
Merge branch 'issue/431' of git://github.com/oandrieu/opam
Update generated configure file