From df7c58a3360f5f3faa33ebebe4cc3e8b595472a8 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Mon, 8 Nov 2010 13:55:49 +0000 Subject: [PATCH] build: Add ./configure --disable-ocaml option. This can be used to disable the OCaml bindings. Note that OCaml is still required in any case where you need to rerun the generator. (cherry picked from commit af7af2fc5e48e4efecd1f65b60e61b88733161b9) --- configure.ac | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 125d3f5..e336d24 100644 --- a/configure.ac +++ b/configure.ac @@ -489,15 +489,27 @@ AS_IF([test "x$enable_fuse" != "xno"], AM_CONDITIONAL([HAVE_FUSE],[test "x$enable_fuse" != "xno"]) dnl Check for OCaml (optional, for OCaml bindings). -AC_PROG_OCAML -AC_PROG_FINDLIB -AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) - -dnl Optional xml-light for running the generator. +OCAMLC=no +OCAMLFIND=no OCAML_PKG_xml_light=no -if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then - AC_CHECK_OCAML_PKG([xml-light]) -fi +AC_ARG_ENABLE([ocaml], + AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]), + [], + [enable_ocaml=yes]) +AS_IF([test "x$enable_ocaml" != "xno"], + [dnl OCAMLC and OCAMLFIND have to be unset first, otherwise + dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look. + OCAMLC= + OCAMLFIND= + AC_PROG_OCAML + AC_PROG_FINDLIB + + dnl Optional xml-light for running the generator. + if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then + AC_CHECK_OCAML_PKG([xml-light]) + fi]) +AM_CONDITIONAL([HAVE_OCAML], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) AM_CONDITIONAL([HAVE_XML_LIGHT],[test "x$OCAML_PKG_xml_light" != "xno"]) dnl Build the OCaml viewer example. This has a lengthy list of -- 1.8.3.1