X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fconfigure.ac;h=ec803c853b9c84d9c481b74659d22cfbc7f4702b;hb=a82d87a4c2ff9f518385fba7357dafb632a22882;hp=295e427bbadb7da9d31f22fb9e5635587cc5ddb0;hpb=61ba0c2fdf684d7b0bcc7b75b3552a0023f5d875;p=helm.git

diff --git a/helm/software/configure.ac b/helm/software/configure.ac
index 295e427bb..ec803c853 100644
--- a/helm/software/configure.ac
+++ b/helm/software/configure.ac
@@ -1,12 +1,15 @@
 AC_INIT(matita/matitaTypes.ml)
 
-# Distribution settings (i.e. settings to be manipulated before a release)
+# Distribution settings
+# (i.e. settings (automatically) manipulated before a release)
 DEBUG_DEFAULT="true"
-DEFAULT_DBHOST="mowgli.cs.unibo.it"
+DEFAULT_DBHOST="mysql://mowgli.cs.unibo.it"
 RT_BASE_DIR_DEFAULT="`pwd`/matita"
-MATITA_VERSION="0.1.0"
+MATITA_VERSION="0.5.8"
+DISTRIBUTED="no"  # "yes" for distributed tarballs
 # End of distribution settings
 
+SRCROOT=`pwd`
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
 if test $HAVE_OCAMLC = "no"; then
   AC_MSG_ERROR(could not find ocamlc)
@@ -27,11 +30,11 @@ if test $HAVE_LABLGLADECC = "yes"; then
 else
   AC_MSG_ERROR(could not find lablgladecc2)
 fi
-AC_CHECK_PROG(HAVE_CAMLP4O, camlp4o, yes, no)
-if test $HAVE_CAMLP4O = "yes"; then
-  CAMLP4O="camlp4o"
+AC_CHECK_PROG(HAVE_CAMLP5O, camlp5o, yes, no)
+if test $HAVE_CAMLP5O = "yes"; then
+  CAMLP5O="camlp5o"
 else
-  AC_MSG_ERROR(could not find camlp4o)
+  AC_MSG_ERROR(could not find camlp5o)
 fi
 
 # look for METAS dir
@@ -59,23 +62,32 @@ expat \
 gdome2 \
 http \
 lablgtk2 \
+lablgtk2.sourceview2 \
 lablgtkmathview \
-lablgtksourceview \
 mysql \
 netstring \
-ulex \
+ulex08 \
 zip \
 "
 
 # (Matita) findlib requisites
 
 FINDLIB_COMREQUIRES="\
+helm-disambiguation \
 helm-cic_disambiguation \
 helm-grafite \
 helm-grafite_engine \
+helm-tptp_grafite \
+helm-ng_disambiguation \
+helm-ng_cic_content \
 helm-grafite_parser \
+helm-acic_procedural \
+helm-content_pres \
 helm-hgdome \
 helm-tactics \
+helm-ng_paramodulation \
+helm-ng_tactics \
+helm-cic_exportation \
 "
 FINDLIB_CREQUIRES=" \
 $FINDLIB_COMREQUIRES \
@@ -84,7 +96,7 @@ FINDLIB_REQUIRES="\
 $FINDLIB_CREQUIRES \
 lablgtk2.glade \
 lablgtkmathview \
-lablgtksourceview \
+lablgtk2.sourceview2 \
 helm-xmldiff \
 "
 for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
@@ -136,39 +148,72 @@ else
 fi
 AC_MSG_RESULT($MSG)
 
+AC_MSG_CHECKING(--enable-annot argument)
+AC_ARG_ENABLE(annot,
+  [  --enable-annot	  Turn on -dtypes compilation option],
+  [GIVEN="yes";
+   case "${enableval}" in
+   yes) ANNOT=true;;
+   no)  ANNOT=false;;
+   *) AC_MSG_ERROR(bad value ${enableval} for --enable-annot) ;;
+  esac],
+  [GIVEN="no"; ANNOT="false"])
+MSG=$GIVEN
+if test "$ANNOT" = "true"; then
+  MSG="$MSG, type annotation enabled."
+else
+  MSG="$MSG, type annotation disabled."
+fi
+AC_MSG_RESULT($MSG)
+
+
 AC_MSG_CHECKING(--with-runtime-dir argument)
 AC_ARG_WITH(runtime-dir,
   [  --with-runtime-dir      Runtime directory (current working directory if not given)],
   [ RT_BASE_DIR="${withval}" ],
   [ RT_BASE_DIR="$RT_BASE_DIR_DEFAULT" ])
-AC_MSG_RESULT($RT_BASE_DIR)
+MSG="$RT_BASE_DIR"
+if test "yes" = "$RT_BASE_DIR"; then
+  MSG="
+** error:                                                                  **
+**  empty --with-runtime-dir argument, please use --with-runtime-dir=value **"
+fi
+AC_MSG_RESULT($MSG)
 
 AC_MSG_CHECKING(--with-dbhost argument)
 AC_ARG_WITH(dbhost,
   [  --with-dbhost           SQL database hostname],
   [ DBHOST="${withval}" ],
   [ DBHOST="$DEFAULT_DBHOST" ])
-AC_MSG_RESULT($DBHOST)
+MSG="$DBHOST"
+if test "yes" = "$DBHOST"; then
+  MSG="
+** error:                                                                  **
+**  empty --with-dbhost argument, please use --with-dbhost=value           **"
+fi
+AC_MSG_RESULT($MSG)
 
-AC_SUBST(CAMLP4O)
+AC_SUBST(CAMLP5O)
 AC_SUBST(DBHOST)
 AC_SUBST(DEBUG)
-AC_SUBST(TRANSFORMER_MODULE)
-AC_SUBST(FINDLIB_REQUIRES)
+AC_SUBST(ANNOT)
+AC_SUBST(DISTRIBUTED)
 AC_SUBST(FINDLIB_CREQUIRES)
+AC_SUBST(FINDLIB_REQUIRES)
 AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
+AC_SUBST(MATITA_VERSION)
 AC_SUBST(OCAMLFIND)
 AC_SUBST(OCAMLPATH)
 AC_SUBST(RT_BASE_DIR)
-AC_SUBST(MATITA_VERSION)
+AC_SUBST(SRCROOT)
+AC_SUBST(TRANSFORMER_MODULE)
 
 AC_OUTPUT([
   components/extlib/componentsConf.ml
-  matita/matita.conf.xml.devel
-  matita/matita.conf.xml.user
-  matita/matita.conf.xml.build
+  matita/matita.conf.xml
   matita/buildTimeConf.ml
   matita/gtkmathview.matita.conf.xml
+  matita/help/C/version.txt
   Makefile.defs
 ])