From 0350e6abce26e8b619a924c4f4ad1411704aa6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 6 Jul 2015 10:28:03 +0200 Subject: [PATCH 1/2] Set OCAMLC to empty if Ocaml compiler not found OCAMLC is tested for 'empty string' when setting SKIP_OCAML (configure.ac:2677), setting it to ':' will not skip ocaml. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 712ca0abd..bc9567219 100644 --- a/configure.ac +++ b/configure.ac @@ -1891,7 +1891,7 @@ else AC_MSG_CHECKING(for Ocaml compiler) if test -z "$OCAMLC"; then - AC_CHECK_PROGS(OCAMLC, ocamlc, :) + AC_CHECK_PROGS(OCAMLC, ocamlc, ) fi AC_MSG_CHECKING(for Ocaml toplevel creator) From a3f0921c577a5f169080641e59bd247b5fb322b9 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 30 Jul 2015 23:32:54 +0100 Subject: [PATCH 2/2] Ocaml configure changes Remove use of peculiar ':' default for OCAML in AC_CHECK_PROGS. Further refinement of issue #458. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index bc9567219..62dd4f6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1881,27 +1881,27 @@ if test x"${with_ocaml}" = xno -o x"${with_alllang}" = xno ; then else AC_MSG_CHECKING(for Ocaml DL load generator) if test -z "$OCAMLDLGEN"; then - AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen, :) + AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen) fi AC_MSG_CHECKING(for Ocaml package tool) if test -z "$OCAMLFIND"; then - AC_CHECK_PROGS(OCAMLFIND, ocamlfind, :) + AC_CHECK_PROGS(OCAMLFIND, ocamlfind) fi AC_MSG_CHECKING(for Ocaml compiler) if test -z "$OCAMLC"; then - AC_CHECK_PROGS(OCAMLC, ocamlc, ) + AC_CHECK_PROGS(OCAMLC, ocamlc) fi AC_MSG_CHECKING(for Ocaml toplevel creator) if test -z "$OCAMLMKTOP"; then - AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :) + AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop) fi AC_MSG_CHECKING(for Ocaml Pre-Processor-Pretty-Printer) if test -z "$CAMLP4"; then - AC_CHECK_PROGS(CAMLP4, camlp4, :) + AC_CHECK_PROGS(CAMLP4, camlp4) fi fi # Disabling ocaml