X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fconfigure.ac;h=a530cae5600dac6546df9c9ef4a9c7b5ebe91a33;hb=5022202a659044d981833ba8665424a52684b07f;hp=e25e1c65c1aa7e3e029ab0c0d676ded7477e87a4;hpb=25d3d1c2613fd2b4e6a323289ca94fb7b75ebe5d;p=helm.git

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index e25e1c65c..a530cae56 100644
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -26,17 +26,19 @@ if test $HAVE_CAMLP4O = "yes"; then
 else
   AC_MSG_ERROR(could not find camlp4o)
 fi
-
-FINDLIB_CREQUIRES="\
+FINDLIB_DEPREQUIRES="\
 pcre \
 mysql \
+helm-registry \
+helm-cic_textual_parser2 \
+"
+FINDLIB_CLEANREQUIRES="$FINDLIB_DEPREQUIRES"
+FINDLIB_CREQUIRES="\
+$FINDLIB_CLEANREQUIRES \
 unix \
 helm-cic_omdoc \
-helm-cic_transformations \
-helm-registry \
 helm-tactics \
 helm-xml \
-helm-cic_textual_parser2 \
 "
 FINDLIB_REQUIRES="\
 $FINDLIB_CREQUIRES \
@@ -48,7 +50,7 @@ helm-xmldiff \
 for r in $FINDLIB_REQUIRES
 do
   AC_MSG_CHECKING(for $r ocaml library)
-  if $OCAMLFIND query $r &> /dev/null; then
+  if OCAMLPATH=../ocaml/METAS $OCAMLFIND query $r &> /dev/null; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_ERROR(could not find $r ocaml library)
@@ -87,19 +89,26 @@ if test "$DEBUG" = "true"; then
   echo "debugging enabled"
 fi
 
-RT_BASE_DIR="."
+RT_BASE_DIR=`pwd`
+USER_HOME=`pwd` #should be `echo $HOME`
+USER_NAME=`echo $USER`
 
 AC_SUBST(CAMLP4O)
 AC_SUBST(DEBUG)
 AC_SUBST(TRANSFORMER_MODULE)
 AC_SUBST(FINDLIB_REQUIRES)
 AC_SUBST(FINDLIB_CREQUIRES)
+AC_SUBST(FINDLIB_DEPREQUIRES)
+AC_SUBST(FINDLIB_CLEANREQUIRES)
 AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
 AC_SUBST(OCAMLFIND)
 AC_SUBST(RT_BASE_DIR)
+AC_SUBST(USER_HOME)
+AC_SUBST(USER_NAME)
 
 AC_OUTPUT([
+  matita.conf.xml.sample
   buildTimeConf.ml
   Makefile
 ])