Skip to content

Commit

Permalink
configure: move configure.ml
Browse files Browse the repository at this point in the history
  • Loading branch information
aantron committed Aug 31, 2018
1 parent 3fb05f9 commit e7be480
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ check-config:

.PHONY: default-config
default-config:
ocaml src/util/configure.ml -use-libev false
ocaml src/unix/config/configure.ml -use-libev false

# Install dependencies needed during development.
.PHONY : dev-deps
Expand Down
2 changes: 1 addition & 1 deletion lwt.opam
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ license: "MIT"
dev-repo: "https://github.com/ocsigen/lwt.git"

build: [
[ "ocaml" "src/util/configure.ml" "-use-libev" "%{conf-libev:installed}%" ]
[ "ocaml" "src/unix/config/configure.ml" "-use-libev" "%{conf-libev:installed}%" ]
[ "dune" "build" "-p" name "-j" jobs ]
]

Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions src/unix/config/discover.ml
Original file line number Diff line number Diff line change
Expand Up @@ -684,11 +684,11 @@ You may be missing core components (compiler, ncurses, etc)
printf "
Some required C libraries were not found. If a C library <lib> is installed in a
non-standard location, set <LIB>_CFLAGS and <LIB>_LIBS accordingly. You may also
try 'ocaml src/utils/configure.ml -use-<lib> false' to avoid compiling support for
it. For example, in the case of libev missing:
try 'ocaml src/unix/config/configure.ml -use-<lib> false' to avoid compiling
support for it. For example, in the case of libev missing:
export LIBEV_CFLAGS=-I/opt/local/include
export LIBEV_LIBS='-L/opt/local/lib -lev'
(* or: *) ocaml src/utils/configure.ml -use-libev false
(* or: *) ocaml src/unix/config/configure.ml -use-libev false
Missing C libraries: %s
" (String.concat ", " !not_available);
Expand Down
2 changes: 1 addition & 1 deletion src/util/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ else
LIBEV_FLAG=false
fi

ocaml src/util/configure.ml -use-libev $LIBEV_FLAG
ocaml src/unix/config/configure.ml -use-libev $LIBEV_FLAG
make build
make test
make coverage
Expand Down

0 comments on commit e7be480

Please sign in to comment.