X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=configure.ac;h=00ae3a37d36a697491096ba52c29acff3e96df91;hb=7b83798d68b4ccd05f0b9604d969a0b547bef402;hp=90d14f49f821f0b6515771015fe1e42682fa09d8;hpb=58b4a55da40191b2a2aa14a7daa83639d5925243;p=helm.git

diff --git a/configure.ac b/configure.ac
index 90d14f49f..00ae3a37d 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/"
+# Distribution settings
+# (i.e. settings (automatically) manipulated before a release)
+DEBUG_DEFAULT="true"
+DEFAULT_DBHOST="mowgli.cs.unibo.it"
+RT_BASE_DIR_DEFAULT="`pwd`/matita"
 MATITA_VERSION="0.1.0"
+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)
@@ -36,19 +39,8 @@ 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.*
 
@@ -164,22 +156,25 @@ AC_MSG_RESULT($DBHOST)
 AC_SUBST(CAMLP4O)
 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
+  components/extlib/componentsConf.ml
   matita/matita.conf.xml.devel
   matita/matita.conf.xml.user
   matita/matita.conf.xml.build
   matita/buildTimeConf.ml
   matita/gtkmathview.matita.conf.xml
+  matita/help/C/version.txt
   Makefile.defs
 ])