From e7be480ab8dc4021f31eb39fb8507cbbd1c8e021 Mon Sep 17 00:00:00 2001
From: Anton Bachin <antonbachin@yahoo.com>
Date: Thu, 30 Aug 2018 15:50:50 -0500
Subject: [PATCH] configure: move configure.ml

---
 Makefile                               | 2 +-
 lwt.opam                               | 2 +-
 src/{util => unix/config}/configure.ml | 0
 src/unix/config/discover.ml            | 6 +++---
 src/util/travis.sh                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{util => unix/config}/configure.ml (100%)

diff --git a/Makefile b/Makefile
index 17fb7cefaa..39b0dea0a3 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/lwt.opam b/lwt.opam
index a9d7cf0235..79009c4cc2 100644
--- a/lwt.opam
+++ b/lwt.opam
@@ -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 ]
 ]
 
diff --git a/src/util/configure.ml b/src/unix/config/configure.ml
similarity index 100%
rename from src/util/configure.ml
rename to src/unix/config/configure.ml
diff --git a/src/unix/config/discover.ml b/src/unix/config/discover.ml
index 07c6762b29..913cd1cccc 100644
--- a/src/unix/config/discover.ml
+++ b/src/unix/config/discover.ml
@@ -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);
diff --git a/src/util/travis.sh b/src/util/travis.sh
index 1c0975a59e..97ddd8912c 100644
--- a/src/util/travis.sh
+++ b/src/util/travis.sh
@@ -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