Fix handling of OCAML_PKG_* macros for new OCaml autoconf.