better dependencies among modules and symlinking of several matitatools to a single...

[helm.git] / helm / matita / configure.ac

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index 678cc23422ec29fc69d298b2aeb3acfb7525c006..4f8c991d1082d380e1fd4fe6bdcd089360e5d87e 100644 (file)
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -26,20 +26,25 @@ if test $HAVE_CAMLP4O = "yes"; then
 else
   AC_MSG_ERROR(could not find camlp4o)
 fi
-FINDLIB_DEPREQUIRES="\
+FINDLIB_COMREQUIRES="\
 pcre \
 mysql \
 helm-registry \
-helm-cic_textual_parser2 \
-"
-FINDLIB_CLEANREQUIRES="$FINDLIB_DEPREQUIRES"
-FINDLIB_CREQUIRES="\
-$FINDLIB_CLEANREQUIRES \
-unix \
-helm-cic_omdoc \
+helm-extlib \
+helm-hmysql \
+helm-cic_notation \
 helm-tactics \
+helm-cic_disambiguation \
+"
+FINDLIB_CLEANREQUIRES="$FINDLIB_COMREQUIRES"
+FINDLIB_DEPREQUIRES="$FINDLIB_COMREQUIRES"
+FINDLIB_MAKEREQUIRES=" \
+helm-registry \
+helm-extlib \
+"
+FINDLIB_CREQUIRES=" \
+$FINDLIB_COMREQUIRES \
 helm-paramodulation \
-helm-xml \
 "
 FINDLIB_REQUIRES="\
 $FINDLIB_CREQUIRES \
@@ -47,6 +52,10 @@ lablgtk2.glade \
 lablgtkmathview \
 lablgtksourceview \
 helm-xmldiff \
+helm-cic_transformations \
+helm-tactics \
+helm-cic_disambiguation \
+helm-paramodulation \
 "
 for r in $FINDLIB_REQUIRES
 do
@@ -59,22 +68,22 @@ do
 done
 
 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
+# 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
@@ -101,6 +110,7 @@ AC_SUBST(FINDLIB_REQUIRES)
 AC_SUBST(FINDLIB_CREQUIRES)
 AC_SUBST(FINDLIB_DEPREQUIRES)
 AC_SUBST(FINDLIB_CLEANREQUIRES)
+AC_SUBST(FINDLIB_MAKEREQUIRES)
 AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
 AC_SUBST(OCAMLFIND)
@@ -112,4 +122,5 @@ AC_OUTPUT([
   matita.conf.xml.sample
   buildTimeConf.ml
   Makefile
+  gtkmathview.matita.conf.xml
 ])