- no longer need to dynamically discover if the components dir is libs/ or

  ocaml/: now it is components/(!)
- reverted default settings to the devel ones (debugging on, runtime dir=`pwd`,
  ...)

diff --git a/helm/software/configure.ac b/helm/software/configure.ac
index 90d14f49f821f0b6515771015fe1e42682fa09d8..295e427bbadb7da9d31f22fb9e5635587cc5ddb0 100644 (file)
--- a/helm/software/configure.ac
+++ b/helm/software/configure.ac
@@ -1,9 +1,9 @@
 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/"
+DEBUG_DEFAULT="true"
+DEFAULT_DBHOST="mowgli.cs.unibo.it"
+RT_BASE_DIR_DEFAULT="`pwd`/matita"
 MATITA_VERSION="0.1.0"
 # End of distribution settings
 
@@ -36,19 +36,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.*
 
@@ -175,7 +164,7 @@ AC_SUBST(RT_BASE_DIR)
 AC_SUBST(MATITA_VERSION)
 
 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