no more multiple configure/Makefile, just one for both ocaml/ and matita/

[helm.git] / helm / configure.ac

diff --git a/helm/configure.ac b/helm/configure.ac
index c07a962ae2d12011a9019cc44f15e0cb18235e98..1767637199d2824c4df10341b3e502e96f9f5115 100644 (file)
--- a/helm/configure.ac
+++ b/helm/configure.ac
@@ -1,9 +1,9 @@
-AC_INIT(matitaTypes.ml)
+AC_INIT(matita/matitaTypes.ml)
 
 # Distribution settings (i.e. settings to be manipulated before a release)
 DEBUG_DEFAULT="true"
-RT_BASE_DIR_DEFAULT="`pwd`"
-MATITA_VERSION="0.0.1"
+RT_BASE_DIR_DEFAULT="`pwd`/matita"
+MATITA_VERSION="0.1.0"
 # End of distribution settings
 
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
@@ -32,6 +32,53 @@ if test $HAVE_CAMLP4O = "yes"; then
 else
   AC_MSG_ERROR(could not find camlp4o)
 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
+
+# creating META.*
+
+echo -n "creating METAs ... "
+for f in $OCAMLPATH/meta.*.src; do
+  basename=`basename $f`
+  metaname=`echo $basename | sed 's/meta\.\(.*\)\.src/\1/'`
+  dirname=`echo $metaname | sed 's/^helm-//'`
+  metafile="$OCAMLPATH/META.$metaname"
+  cp $f $metafile
+  echo "directory=\"$LIBSPATH/$dirname\"" >> $metafile
+done
+echo "done"
+
+# (libs) findlib requisites
+
+FINDLIB_LIBSREQUIRES="\
+expat \
+gdome2 \
+http \
+lablgtk2 \
+lablgtkmathview \
+lablgtksourceview \
+mysql \
+netstring \
+ulex \
+zip \
+"
+
+# (Matita) findlib requisites
+
 FINDLIB_COMREQUIRES="\
 helm-cic_disambiguation \
 helm-grafite \
@@ -40,12 +87,6 @@ helm-grafite_parser \
 helm-hgdome \
 helm-tactics \
 "
-FINDLIB_CLEANREQUIRES="$FINDLIB_COMREQUIRES"
-FINDLIB_DEPREQUIRES="$FINDLIB_COMREQUIRES"
-FINDLIB_MAKEREQUIRES=" \
-helm-registry \
-helm-extlib \
-"
 FINDLIB_CREQUIRES=" \
 $FINDLIB_COMREQUIRES \
 "
@@ -56,10 +97,10 @@ lablgtkmathview \
 lablgtksourceview \
 helm-xmldiff \
 "
-for r in $FINDLIB_REQUIRES
+for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
 do
   AC_MSG_CHECKING(for $r ocaml library)
-  if OCAMLPATH=../ocaml/METAS $OCAMLFIND query $r &> /dev/null; then
+  if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then
     AC_MSG_RESULT(yes)
   else
     AC_MSG_ERROR(could not find $r ocaml library)
@@ -117,18 +158,16 @@ AC_SUBST(DEBUG)
 AC_SUBST(TRANSFORMER_MODULE)
 AC_SUBST(FINDLIB_REQUIRES)
 AC_SUBST(FINDLIB_CREQUIRES)
-AC_SUBST(FINDLIB_DEPREQUIRES)
-AC_SUBST(FINDLIB_CLEANREQUIRES)
-AC_SUBST(FINDLIB_MAKEREQUIRES)
 AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
 AC_SUBST(OCAMLFIND)
+AC_SUBST(OCAMLPATH)
 AC_SUBST(RT_BASE_DIR)
 AC_SUBST(MATITA_VERSION)
 
 AC_OUTPUT([
-  matita.conf.xml.sample
-  buildTimeConf.ml
-  Makefile
-  gtkmathview.matita.conf.xml
+  matita/matita.conf.xml.sample
+  matita/buildTimeConf.ml
+  matita/gtkmathview.matita.conf.xml
+  Makefile.defs
 ])