X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fconfigure.ac;h=7e2591f8fc9b1d9d2de2e524565a1edffa635f1a;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=2cf2e52b845f38edc0923d5d117eba3225bad873;hpb=1d431843f49b3658593c8cc918b53a43479a6486;p=helm.git

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index 2cf2e52b8..7e2591f8f 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
-
-DBI_DRIVER="mysql"
-
-FINDLIB_REQUIRES="\
-lablgtk2.glade \
-lablgtkmathview \
+FINDLIB_DEPREQUIRES="\
 pcre \
-dbi.$DBI_DRIVER \
+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 \
+"
+FINDLIB_REQUIRES="\
+$FINDLIB_CREQUIRES \
+lablgtk2.glade \
+lablgtkmathview \
+lablgtksourceview \
 helm-xmldiff \
-helm-cic_textual_parser2 \
-helm-mathql_interpreter \
 "
 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,18 +89,19 @@ if test "$DEBUG" = "true"; then
   echo "debugging enabled"
 fi
 
-MATITA_GTKRC="matita.gtkrc"
-DBI_MODULE="Dbi_$DBI_DRIVER"
+RT_BASE_DIR=`pwd`
 
 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(DBI_MODULE)
+AC_SUBST(RT_BASE_DIR)
 
 AC_OUTPUT([
   buildTimeConf.ml