From 92f5310c7a4749f3fb0d0246707b9ac7ce01819f Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Fri, 3 Feb 2006 15:44:40 +0000 Subject: [PATCH] - 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`, ...) --- configure.ac | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 90d14f49f..295e427bb 100644 --- a/configure.ac +++ b/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 -- 2.39.2