X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fconfigure.ac;h=3370b61b29bc4503ffe7969abb9d3ddcff234383;hb=1292d243af469c5cb3dcb3677d84012420de015e;hp=00ae3a37d36a697491096ba52c29acff3e96df91;hpb=6668928408fea93c7d1b955a839f7bae1af6b8f2;p=helm.git diff --git a/helm/software/configure.ac b/helm/software/configure.ac index 00ae3a37d..3370b61b2 100644 --- a/helm/software/configure.ac +++ b/helm/software/configure.ac @@ -3,9 +3,9 @@ AC_INIT(matita/matitaTypes.ml) # 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.4.0" DISTRIBUTED="no" # "yes" for distributed tarballs # End of distribution settings @@ -30,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 @@ -66,7 +66,7 @@ lablgtkmathview \ lablgtksourceview \ mysql \ netstring \ -ulex \ +ulex08 \ zip \ " @@ -76,7 +76,10 @@ 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 \ " @@ -144,16 +147,28 @@ 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(DISTRIBUTED) @@ -170,9 +185,7 @@ 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