X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fconfigure.ac;h=293d8a7677f3e790e6d5f2c2b406bcb08dcd29c4;hb=f9ebeb4695e5598fe9ffa80d938bdd484ac99dab;hp=1af1fca87efe297ac7a060833ae114d15d14d1ea;hpb=ac813b7e251e4bac1a8a16befa628203775771ca;p=helm.git

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index 1af1fca87..293d8a767 100644
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(matita.ml)
+AC_INIT(matitaTypes.ml)
 
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
 if test $HAVE_OCAMLC = "no"; then
@@ -26,28 +26,31 @@ 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 \
 lablgtk2.glade \
 lablgtkmathview \
+lablgtksourceview \
 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)
@@ -86,19 +89,26 @@ if test "$DEBUG" = "true"; then
   echo "debugging enabled"
 fi
 
-MATITA_GTKRC="matita.gtkrc"
+RT_BASE_DIR=`pwd`
+USER_HOME=`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(MATITA_GTKRC)
+AC_SUBST(RT_BASE_DIR)
+AC_SUBST(USER_HOME)
+AC_SUBST(USER_NAME)
 
 AC_OUTPUT([
+  matita.conf.xml.sample
   buildTimeConf.ml
   Makefile
 ])