X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=configure.ac;h=90e1dc286851a33a2f1a4cf2bf477b1a0f4babd3;hb=refs%2Fheads%2F0.4.95;hp=90d14f49f821f0b6515771015fe1e42682fa09d8;hpb=58b4a55da40191b2a2aa14a7daa83639d5925243;p=helm.git

diff --git a/configure.ac b/configure.ac
index 90d14f49f..90e1dc286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,15 @@
 AC_INIT(matita/matitaTypes.ml)
 
-# Distribution settings (i.e. settings to be manipulated before a release)
-DEBUG_DEFAULT="false"
-DEFAULT_DBHOST="localhost"
-RT_BASE_DIR_DEFAULT="/usr/local/share/matita/"
-MATITA_VERSION="0.1.0"
+# Distribution settings
+# (i.e. settings (automatically) manipulated before a release)
+DEBUG_DEFAULT="true"
+DEFAULT_DBHOST="mysql://mowgli.cs.unibo.it"
+RT_BASE_DIR_DEFAULT="`pwd`/matita"
+MATITA_VERSION="0.4.95"
+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,28 +30,17 @@ 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
 
-OCAMLPATH=""
-LIBSPATH=""
-if test -d libs ; then
-  OCAMLPATH=`pwd`/libs/METAS
-  LIBSPATH=`pwd`/libs
-fi
-if test -d ocaml ; then
-  OCAMLPATH=`pwd`/ocaml/METAS
-  LIBSPATH=`pwd`/ocaml
-fi
-if test -z $OCAMLPATH; then
-  AC_MSG_ERROR(could not find METAS directory)
-fi
+LIBSPATH="`pwd`/components"
+OCAMLPATH="$LIBSPATH/METAS"
 
 # creating META.*
 
@@ -74,7 +66,7 @@ lablgtkmathview \
 lablgtksourceview \
 mysql \
 netstring \
-ulex \
+ulex08 \
 zip \
 "
 
@@ -84,9 +76,13 @@ FINDLIB_COMREQUIRES="\
 helm-cic_disambiguation \
 helm-grafite \
 helm-grafite_engine \
+helm-tptp_grafite \
 helm-grafite_parser \
+helm-acic_procedural \
+helm-content_pres \
 helm-hgdome \
 helm-tactics \
+helm-cic_exportation \
 "
 FINDLIB_CREQUIRES=" \
 $FINDLIB_COMREQUIRES \
@@ -152,34 +148,47 @@ 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(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([
-  $LIBSPATH/extlib/componentsConf.ml
-  matita/matita.conf.xml.devel
-  matita/matita.conf.xml.user
-  matita/matita.conf.xml.build
+  components/extlib/componentsConf.ml
+  matita/matita.conf.xml
   matita/buildTimeConf.ml
   matita/gtkmathview.matita.conf.xml
+  matita/help/C/version.txt
   Makefile.defs
 ])