Skip to content

Add seq dep for ocaml < 4.07 #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lefessan wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Add seq dep for ocaml < 4.07 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,15 @@ OCPLIB_NAMES=debug lang unix file system config compat

CMDLINER_DIR := $(shell ocamlfind query cmdliner)
RE_DIR := $(shell ocamlfind query re)
ifeq (${NEED_SEQ},true)
SEQ_DIR := $(shell ocamlfind query seq)
SEQ_DEP := ${SEQ_DIR}/seq.cmxa
endif
RE_DIR := $(shell ocamlfind query re)
EXTERNAL_INCLUDES= -I ${CMDLINER_DIR} -I ${RE_DIR}
EXTERNAL_LIBS=\
${CMDLINER_DIR}/cmdliner.cmxa \
${SEQ_DEP} \
${RE_DIR}/re.cmxa

INCLUDES=$(foreach lib, $(OCPLIB_NAMES), -I $($(lib)_SRCDIR)) \
Expand Down
4 changes: 2 additions & 2 deletions autoconf/Makefile.config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OCAMLFIND=@OCAMLFIND@
OCAMLYACC=@OCAMLYACC@
OCAMLLEX=@OCAMLLEX@
PROJECTURE_ARGS=@PROJECTURE_ARGS@
CONFIGURE_ARGS=@CONFIGURE_ARGS@
ROOTDIR=@ROOTDIR@
prefix=@prefix@
exec_prefix=@exec_prefix@
Expand All @@ -19,7 +19,6 @@ OPAM_REPO_OFFICIAL_REMOTE=@OPAM_REPO_OFFICIAL_REMOTE@
OPAM_REPO_FORK_REMOTE=@OPAM_REPO_FORK_REMOTE@
DOWNLOAD_URL_PREFIX=@DOWNLOAD_URL_PREFIX@
OCAMLVERSION=@OCAMLVERSION@
OCAMLVERSION_C=@OCAMLVERSION_C@
OCAMLC=@OCAMLC@
OCAMLOPT=@OCAMLOPT@
OCAMLDEP=@OCAMLDEP@
Expand All @@ -29,4 +28,5 @@ OCAMLDOC=@OCAMLDOC@
OCAMLLIB=@OCAMLLIB@
OCAMLBIN=@OCAMLBIN@
HAS_BYTES=@HAS_BYTES@
NEED_SEQ=@NEED_SEQ@
OCAML_USE_BINANNOT=@OCAML_USE_BINANNOT@
2 changes: 1 addition & 1 deletion autoconf/config.ocp2gen.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ autoconf = {
opam_repo_fork_remote="@OPAM_REPO_FORK_REMOTE@";
download_url_prefix="@DOWNLOAD_URL_PREFIX@";
conf_ocamlversion="@OCAMLVERSION@";
conf_ocamlversion_c="@OCAMLVERSION_C@";
conf_ocamlc="@OCAMLC@";
conf_ocamlopt="@OCAMLOPT@";
conf_ocamldep="@OCAMLDEP@";
Expand All @@ -29,6 +28,7 @@ autoconf = {
conf_ocamllib="@OCAMLLIB@";
conf_ocamlbin="@OCAMLBIN@";
conf_has_bytes="@HAS_BYTES@";
conf_need_seq="@NEED_SEQ@";
ocaml_use_binannot = @OCAML_USE_BINANNOT@;
autoconf_dir = "@PACKAGE_NAME@-autoconf-dir";

Expand Down
2 changes: 1 addition & 1 deletion autoconf/config.ocpgen.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ opam_repo_official_remote="@OPAM_REPO_OFFICIAL_REMOTE@"
opam_repo_fork_remote="@OPAM_REPO_FORK_REMOTE@"
download_url_prefix="@DOWNLOAD_URL_PREFIX@"
conf_ocamlversion="@OCAMLVERSION@"
conf_ocamlversion_c="@OCAMLVERSION_C@"
conf_ocamlc="@OCAMLC@"
conf_ocamlopt="@OCAMLOPT@"
conf_ocamldep="@OCAMLDEP@"
Expand All @@ -28,6 +27,7 @@ conf_ocamldoc="@OCAMLDOC@"
conf_ocamllib="@OCAMLLIB@"
conf_ocamlbin="@OCAMLBIN@"
conf_has_bytes="@HAS_BYTES@"
conf_need_seq="@NEED_SEQ@"
ocaml_use_binannot = @OCAML_USE_BINANNOT@
autoconf_dir = "@PACKAGE_NAME@-autoconf-dir"

Expand Down
Loading