From 92fb6a23d516c8e2bf38dab689bc6ad7f44e7b28 Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Fri, 17 Sep 2021 11:44:49 +0100
Subject: [PATCH] Explicitly check for base64

It's likely to remain available via Dose3, but as we also explicitly use
it, we should check for it.
---
 configure    | 26 ++++++++++++++++++++++++++
 configure.ac |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/configure b/configure
index c773f9542ad..9f622f2ade0 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,7 @@ OCAML_PKG_dose3_common
 OCAML_PKG_cudf
 OCAML_PKG_ocamlgraph
 OCAML_PKG_cmdliner
+OCAML_PKG_base64
 OCAML_PKG_re_glob
 OCAML_PKG_re
 OCAML_PKG_extlib
@@ -5893,6 +5894,30 @@ $as_echo "not found" >&6; }
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package base64" >&5
+$as_echo_n "checking for OCaml findlib package base64... " >&6; }
+
+  unset found
+  unset pkg
+  found=no
+  for pkg in base64  ; do
+    if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+      OCAML_PKG_base64=$pkg
+      found=yes
+      break
+    fi
+  done
+  if test "$found" = "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    OCAML_PKG_base64=no
+  fi
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package cmdliner" >&5
 $as_echo_n "checking for OCaml findlib package cmdliner... " >&6; }
 
@@ -6493,6 +6518,7 @@ echo
 if test "x${enable_checks}" != "xno" && {
        test "x$OCAML_PKG_extlib" = "xno" ||
        test "x$OCAML_PKG_re" = "xno" ||
+       test "x$OCAML_PKG_base64" = "xno" ||
        test "x$OCAML_PKG_cmdliner" = "xno" ||
        test "x$OCAML_PKG_ocamlgraph" = "xno" ||
        test "x$OCAML_PKG_cudf" = "xno" ||
diff --git a/configure.ac b/configure.ac
index e1aed8d3ad4..d220cb1adc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,6 +327,7 @@ AC_CHECK_OCAML_PKG([bigarray])
 AC_CHECK_OCAML_PKG([extlib])
 AC_CHECK_OCAML_PKG([re])
 AC_CHECK_OCAML_PKG([re.glob])
+AC_CHECK_OCAML_PKG([base64])
 AC_CHECK_OCAML_PKG([cmdliner])
 AC_CHECK_OCAML_PKG([ocamlgraph])
 AC_CHECK_OCAML_PKG([cudf])
@@ -392,6 +393,7 @@ echo
 AS_IF([test "x${enable_checks}" != "xno" && {
        test "x$OCAML_PKG_extlib" = "xno" ||
        test "x$OCAML_PKG_re" = "xno" ||
+       test "x$OCAML_PKG_base64" = "xno" ||
        test "x$OCAML_PKG_cmdliner" = "xno" ||
        test "x$OCAML_PKG_ocamlgraph" = "xno" ||
        test "x$OCAML_PKG_cudf" = "xno" ||