Commit 7c991ef2 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Make merlin aware of js_of_ocaml for ide/why3_js.ml.

parent a7821947
...@@ -41,4 +41,4 @@ B plugins/tptp ...@@ -41,4 +41,4 @@ B plugins/tptp
B plugins/python B plugins/python
B lib/why3 B lib/why3
PKG str unix num dynlink @ZIPLIB@ @LABLGTKPKG@ @META_OCAMLGRAPH@ PKG str unix num dynlink @ZIPLIB@ @LABLGTKPKG@ @META_OCAMLGRAPH@ @JSOFOCAMLPKG@
...@@ -645,6 +645,8 @@ else ...@@ -645,6 +645,8 @@ else
if test -z "$JSOFOCAMLPPX"; then if test -z "$JSOFOCAMLPPX"; then
enable_js_of_ocaml=no enable_js_of_ocaml=no
reason_js_of_ocaml=" (js_of_ocaml-ppx not found)" reason_js_of_ocaml=" (js_of_ocaml-ppx not found)"
else
JSOFOCAMLPKG="js_of_ocaml js_of_ocaml.ppx"
fi fi
fi fi
fi fi
...@@ -653,7 +655,7 @@ if test "$enable_web_ide" != yes; then ...@@ -653,7 +655,7 @@ if test "$enable_web_ide" != yes; then
reason_web_ide=" (disabled by user)" reason_web_ide=" (disabled by user)"
elif test "$enable_js_of_ocaml" != yes; then elif test "$enable_js_of_ocaml" != yes; then
enable_web_ide=no enable_web_ide=no
reason_web_ide=" (js_of_ocaml not available)" reason_web_ide=" (Javascript support not available)"
fi fi
# Coq # Coq
...@@ -896,6 +898,7 @@ AC_SUBST(GTKVERSION) ...@@ -896,6 +898,7 @@ AC_SUBST(GTKVERSION)
AC_SUBST(enable_web_ide) AC_SUBST(enable_web_ide)
AC_SUBST(enable_js_of_ocaml) AC_SUBST(enable_js_of_ocaml)
AC_SUBST(JSOFOCAMLPKG)
AC_SUBST(META_OCAMLGRAPH) AC_SUBST(META_OCAMLGRAPH)
......
PKG js_of_ocaml js_of_ocaml.ppx ocplib-simplex PKG ocplib-simplex
REC REC
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment