From a2a9b63b48a0f3440929cad1d60c691900430c3d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 5 Feb 2013 11:31:11 +0000 Subject: tools: update ocamlfind handling configure checks just for ocamlc, but the tools in tools/ocaml depend also on ocamlfind. On my workstation I have just ocamlc installed, but no ocamlfind. As a result make will fail. Update configure.ac to check also for OCAMLFIND, update various Makefiles and replace hardcoded ocamlfind string with $(OCAMLFIND) Please rerun autogen.sh after applying this patch. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- tools/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/configure.ac') diff --git a/tools/configure.ac b/tools/configure.ac index 2bd71b6adc..de5d085974 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -86,7 +86,8 @@ AS_IF([test "x$xapi" = "xy"], [ ]) AS_IF([test "x$ocamltools" = "xy"], [ AC_PROG_OCAML - AS_IF([test "x$OCAMLC" = "xno"], [ + AC_PROG_FINDLIB + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])]) ocamltools="n" -- cgit v1.2.3