jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OCaml testing requires camlp4

Browse source
This commit is contained in:
William S Fulton 2019-04-29 19:39:04 +01:00
commit 78a1515f46
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
configure.ac
View file

@ -2044,6 +2044,16 @@ if test x"${with_ocaml}" = xno; then
AC_MSG_NOTICE([Disabling OCaml]) AC_MSG_NOTICE([Disabling OCaml])
OCAMLC= OCAMLC=
else else
# OCaml compiler
if test -z "$OCAMLC"; then
AC_CHECK_PROGS(OCAMLC, ocamlc)
fi
# OCaml Pre-Processor-Pretty-Printer
if test -z "$CAMLP4"; then
AC_CHECK_PROGS(CAMLP4, camlp4)
fi
# OCaml DL load generator # OCaml DL load generator
if test -z "$OCAMLDLGEN"; then if test -z "$OCAMLDLGEN"; then
AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen) AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen)
@ -2054,27 +2064,17 @@ else
AC_CHECK_PROGS(OCAMLFIND, ocamlfind) AC_CHECK_PROGS(OCAMLFIND, ocamlfind)
fi fi
# OCaml compiler
if test -z "$OCAMLC"; then
AC_CHECK_PROGS(OCAMLC, ocamlc)
fi
# OCaml toplevel creator # OCaml toplevel creator
if test -z "$OCAMLMKTOP"; then if test -z "$OCAMLMKTOP"; then
AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop) AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop)
fi fi
# OCaml Pre-Processor-Pretty-Printer
if test -z "$CAMLP4"; then
AC_CHECK_PROGS(CAMLP4, camlp4)
fi
fi fi
AC_SUBST(OCAMLC) AC_SUBST(OCAMLC)
AC_SUBST(CAMLP4)
AC_SUBST(OCAMLDLGEN) AC_SUBST(OCAMLDLGEN)
AC_SUBST(OCAMLFIND) AC_SUBST(OCAMLFIND)
AC_SUBST(OCAMLMKTOP) AC_SUBST(OCAMLMKTOP)
AC_SUBST(CAMLP4)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Look for C# # Look for C#
@ -2636,7 +2636,7 @@ AC_SUBST(SKIP_PHP)
SKIP_OCAML= SKIP_OCAML=
if test -z "$OCAMLC" ; then if test -z "$OCAMLC" || test -z "$CAMLP4" ; then
SKIP_OCAML="1" SKIP_OCAML="1"
fi fi
AC_SUBST(SKIP_OCAML) AC_SUBST(SKIP_OCAML)