Check for spdx_licenses in configure

Vendored build not enabled if it's missing.
ocaml · Sep 17, 2021 · 72c6fae · 72c6fae
1 parent adbe57b
commit 72c6fae
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -333,6 +333,7 @@ AC_CHECK_OCAML_PKG([cudf])
 AC_CHECK_OCAML_PKG(dose3.common,dose.common)
 AC_CHECK_OCAML_PKG(dose3.algo,dose.algo)
 AC_CHECK_OCAML_PKG([opam-file-format])
+AC_CHECK_OCAML_PKG([spdx_licenses])
 AC_CHECK_OCAML_PKG([mccs])
 AC_CHECK_OCAML_PKG([opam-0install-cudf])
 
@@ -396,6 +397,7 @@ AS_IF([test "x${enable_checks}" != "xno" && {
        test "x$OCAML_PKG_cudf" = "xno" ||
        test "x$OCAML_PKG_dose3_common" = "xno" ||
        test "x$OCAML_PKG_opam_file_format" = "xno" ||
+       test "x$OCAML_PKG_spdx_licenses" = "xno" ||
        test "x$CPPO" = "x" ||
        test "x$OCAML_PKG_mccs$MCCS_ENABLED" = "xnotrue" ||
        test "x$OCAML_PKG_opam_0install_cudf$OPAM_0INSTALL_SOLVER_ENABLED" = "xnotrue";}],[

diff --git a/master_changes.md b/master_changes.md
@@ -99,6 +99,7 @@ users)
   * Use `--without-dune` in `make cold` to avoid picking up external Dune [#4776 @dra27 - fix #3987]
   * Add `--with-vendored-deps` to replace `make lib-ext` instruction [#4776 @dra27 - fix #4772]
   * Fix vendored build on mingw-w64 with g++ 11.2 [#4835 @dra27]
+  * Switch to vendored build if spdx_licenses is missing [#4842 @dra27]
 
 ## Infrastructure
   *