X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fconfigure.ac;h=36bd36194277d16f2f408ab04a37a78799405b93;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=8f368b0f9eead01a3d4749b695a3bb16aa5f5c8a;hpb=43791584692853e980f96b58f36fdfb9c316728f;p=helm.git

diff --git a/helm/ocaml/configure.ac b/helm/ocaml/configure.ac
index 8f368b0f9..36bd36194 100644
--- a/helm/ocaml/configure.ac
+++ b/helm/ocaml/configure.ac
@@ -8,6 +8,29 @@ fi
 AC_CHECK_PROG(HAVE_OCAMLFIND, ocamlfind, yes, no)
 if test $HAVE_OCAMLFIND = "no"; then
   AC_MSG_ERROR(could not find ocamlfind in PATH, please make sure findlib is installed)
+else
+  OCAMLFIND=ocamlfind
+fi
+
+OCAMLFIND_COMMANDS=""
+AC_CHECK_PROG(HAVE_OCAMLC_OPT, ocamlc.opt, yes, no)
+if test $HAVE_OCAMLC_OPT = "yes"; then
+  if test "$OCAMLFIND_COMMANDS" = ""; then
+    OCAMLFIND_COMMANDS="ocamlc=ocamlc.opt"
+  else
+    OCAMLFIND_COMMANDS="$OCAMLFIND_COMMANDS ocamlc=ocamlc.opt"
+  fi
+fi
+AC_CHECK_PROG(HAVE_OCAMLOPT_OPT, ocamlopt.opt, yes, no)
+if test $HAVE_OCAMLOPT_OPT = "yes"; then
+  if test "$OCAMLFIND_COMMANDS" = ""; then
+    OCAMLFIND_COMMANDS="ocamlopt=ocamlopt.opt"
+  else
+    OCAMLFIND_COMMANDS="$OCAMLFIND_COMMANDS ocamlopt=ocamlopt.opt"
+  fi
+fi
+if test "$OCAMLFIND_COMMANDS" != ""; then
+  OCAMLFIND="OCAMLFIND_COMMANDS='$OCAMLFIND_COMMANDS' $OCAMLFIND"
 fi
 
 AC_MSG_CHECKING("where to install the library")
@@ -15,14 +38,12 @@ OCAMLFIND_DEST_DIR="/public/sacerdot/prova"
 AC_MSG_RESULT($OCAMLFIND_DEST_DIR)
 
 AC_MSG_CHECKING("where to install the META files")
-OCAMLFIND_META_DIR="/public/sacerdot/prova/META"
+OCAMLFIND_META_DIR=`pwd`/METAS
 AC_MSG_RESULT($OCAMLFIND_META_DIR)
 
+AC_SUBST(OCAMLFIND)
 AC_SUBST(OCAMLFIND_DEST_DIR)
 AC_SUBST(OCAMLFIND_META_DIR)
-AC_SUBST(CHOSEN_TERM_EDITOR)
-AC_SUBST(CHOSEN_TERM_PARSER)
-AC_SUBST(CHOSEN_TRANSFORMER)
 
 AC_OUTPUT([
   Makefile