From b6f60c6af69cf51da6b112586ada5a6fadaa996a Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Fri, 19 Dec 2014 20:54:38 +0100
Subject: [PATCH 1/2] remove junk in makefile.push_doc

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index dcd252c4..c397b0dd 100644
--- a/Makefile
+++ b/Makefile
@@ -54,10 +54,6 @@ examples: all
 
 push_doc: doc
 	scp -r containers.docdir/* cedeela.fr:~/simon/root/software/containers/
-	scp -r containers_string.docdir/* cedeela.fr:~/simon/root/software/containers/string/
-	scp -r containers_advanced.docdir/* cedeela.fr:~/simon/root/software/containers/advanced
-	scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/
-	scp -r containers_lwt.docdir/* cedeela.fr:~/simon/root/software/containers/lwt/
 
 DONTTEST=myocamlbuild.ml setup.ml $(wildcard src/**/*.cppo.*)
 QTESTABLE=$(filter-out $(DONTTEST), \

From 90f71e08c967ddc7ad745b5d584e251ceda3e915 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Fri, 19 Dec 2014 20:54:52 +0100
Subject: [PATCH 2/2] add a flag to compile containers.advanced only if
 sequence is installed

---
 _oasis        | 6 ++++++
 doc/intro.txt | 3 ++-
 opam          | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/_oasis b/_oasis
index 84f75837..00c5dde5 100644
--- a/_oasis
+++ b/_oasis
@@ -41,6 +41,10 @@ Flag "bigarray"
   Description:  Build modules that depend on bigarrays
   Default:      false
 
+Flag "advanced"
+  Description:  Build advanced combinators, including CCLinq (requires "sequence")
+  Default:      true
+
 Library "containers"
   Path:             src/core
   Modules:          CCVector, CCPrint, CCError, CCHeap, CCList, CCOpt, CCPair,
@@ -86,6 +90,8 @@ Library "containers_advanced"
   Path:             src/advanced
   Pack:             true
   Modules:          CCLinq, CCBatch, CCCat, CCMonadIO
+  Build$:           flag(advanced)
+  Install$:         flag(advanced)
   FindlibName:      advanced
   FindlibParent:    containers
   BuildDepends:     containers, sequence
diff --git a/doc/intro.txt b/doc/intro.txt
index afde017d..2615a2c5 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -101,7 +101,8 @@ Use bigarrays to hold large strings and map files directly into memory.
 
 {4 Advanced}
 
-This module is qualified with [Containers_advanced].
+This module is qualified with [Containers_advanced]. It
+requires {{:https://github.com/c-cube/sequence} Sequence}.
 
 {!modules: CCLinq CCCat CCBatch}
 
diff --git a/opam b/opam
index e20b12c0..8028d27d 100644
--- a/opam
+++ b/opam
@@ -5,6 +5,7 @@ build: [
     ["./configure" "--prefix" prefix "--disable-thread" "--disable-bench"
         "--disable-tests" "--%{lwt:enable}%-lwt"
         "--%{base-bigarray:enable}%-bigarray"
+        "--%{sequence:enable}%-advanced"
         "--enable-docs" "--enable-misc"]
     [make "build"]
 ]
@@ -27,7 +28,7 @@ depends: [
     "base-bytes"
     "cppo" {build}
 ]
-depopts: [ "lwt" ]
+depopts: [ "lwt" "sequence" "base-bigarray" ]
 tags: [ "stdlib" "containers" "iterators" "list" "heap" "queue" ]
 homepage: "https://github.com/c-cube/ocaml-containers/"
 doc: "http://cedeela.fr/~simon/software/containers/"