Skip to content

Commit 0da9f96

Browse files
committed
Update dependencies in configure and Makefile
1 parent 3e4d969 commit 0da9f96

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Makefile.options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ INCS= -I ${BLD}/server/.ocsigenserver.objs/byte \
2323
## ${SERVER_PACKAGE} is not only used to build the 'ocsigenserver' executable
2424
## but also to generate src/baselib/ocsigen_config_static.ml
2525

26-
SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix
26+
SERVER_PACKAGE := lwt_ssl,bytes,lwt.unix,logs,logs-syslog,syslog-message,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix
2727

2828
LIBS := -package ${SERVER_PACKAGE} ${INCS}

configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,9 @@ check_library lwt "See: http://ocsigen.org/lwt"
401401
check_library lwt.unix "Missing support for 'unix' in lwt."
402402
check_library lwt_react "See: http://ocsigen.org/lwt"
403403
check_library lwt_ssl "See: http://ocsigen.org/lwt"
404-
check_library lwt_log "See: http://ocsigen.org/lwt"
404+
check_library logs "See: https://ocaml.org/p/logs"
405+
check_library logs-syslog "See: https://ocaml.org/p/logs-syslog"
406+
check_library syslog-message "See: https://ocaml.org/p/logs-syslog"
405407

406408
check_library re "See: https://github.com/ocaml/ocaml-re/"
407409
check_library cryptokit "See: http://pauillac.inria.fr/~xleroy/software.html#cryptokit"

src/baselib/dune

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
(libraries
2323
str
2424
findlib
25-
lwt_log
2625
lwt.unix
2726
cryptokit
2827
re

src/files/ocsigenserver.conf/gen.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ let deps () =
8484
; "ocsigenserver" ]
8585
in
8686
let packages =
87-
"lwt_ssl,bytes,lwt.unix,lwt_log,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix,hmap"
87+
"lwt_ssl,bytes,lwt.unix,logs,logs-syslog,syslog-message,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix,hmap"
8888
in
8989
let inp =
9090
Unix.open_process_in ("ocamlfind query -p-format -recursive " ^ packages)

0 commit comments

Comments
 (0)