configure.in now used (just to check that ocaml and findlib are there)

Very small bug-fixes.

diff --git a/helm/ocaml/.cvsignore b/helm/ocaml/.cvsignore
index 68dd36db79c6166e99a7247eb0e4e0e7cf7587e9..d69218dfc45fe40fc3b824a195ecbacafb0f0308 100644 (file)
--- a/helm/ocaml/.cvsignore
+++ b/helm/ocaml/.cvsignore
@@ -1 +1,14 @@
-META.helm-cic META.helm-getter META.helm-cic_annotations META.helm-pxp META.helm-cic_annotations_cache META.helm-urimanager META.helm-cic_cache META.helm-xml META.helm-cic_proof_checking
+META.helm-cic
+META.helm-getter
+META.helm-cic_annotations
+META.helm-pxp
+META.helm-cic_annotations_cache
+META.helm-urimanager
+META.helm-cic_cache
+META.helm-xml
+META.helm-cic_proof_checking
+Makefile
+configure
+config.log
+config.cache
+config.status

diff --git a/helm/ocaml/Makefile b/helm/ocaml/Makefile
deleted file mode 100644 (file)
index d983eea..0000000
--- a/helm/ocaml/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Warning: the modules must be in compilation order
-MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
-          cic_cache cic_proof_checking
-
-METAS = $(MODULES:%=META.helm-%)
-CWD=`pwd`
-
-all: $(METAS) $(MODULES:%=%.all)
-opt: $(METAS) $(MODULES:%=%.opt)
-depend: $(MODULES:%=%.depend)
-install: $(MODULES:%=%.install)
-uninstall: $(MODULES:%=%.uninstall)
-clean: $(MODULES:%=%.clean)
-       rm -f $(METAS)
-
-$(MODULES:%=%.all):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) ; make all
-$(MODULES:%=%.opt):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) ; make opt
-$(MODULES:%=%.depend):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) ; make depend
-$(MODULES:%=%.install):
-       cd $(@:%.install=%) ; make install
-$(MODULES:%=%.uninstall):
-       cd $(@:%.uninstall=%) ; make uninstall
-$(MODULES:%=%.clean):
-       cd $(@:%.clean=%) ; make clean
-$(MODULES:%=META.helm-%):
-       cp $@.src $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@
-META.helm-%: META.helm-%.src
-       cp $< $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@

diff --git a/helm/ocaml/Makefile.common b/helm/ocaml/Makefile.common
index b7eefedbc5a7f46355daa628f06325a5a89f3ee0..84a252e940e37c0039b91aa21ef0c92104271770 100644 (file)
--- a/helm/ocaml/Makefile.common
+++ b/helm/ocaml/Makefile.common
@@ -13,7 +13,6 @@ OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep
 
 ARCHIVE = $(PACKAGE).cma
-#ARCHIVE_C = $(PACKAGE).a
 ARCHIVE_OPT = $(PACKAGE).cmxa
 
 

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
new file mode 100644 (file)
index 0000000..83b28f7
--- /dev/null
+++ b/helm/ocaml/Makefile.in
@@ -0,0 +1,32 @@
+# Warning: the modules must be in compilation order
+MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
+          cic_cache cic_proof_checking
+
+METAS = $(MODULES:%=META.helm-%)
+CWD=`pwd`
+
+all: $(METAS) $(MODULES:%=%.all)
+opt: $(METAS) $(MODULES:%=%.opt)
+depend: $(MODULES:%=%.depend)
+install: $(MODULES:%=%.install)
+uninstall: $(MODULES:%=%.uninstall)
+clean: $(MODULES:%=%.clean)
+       rm -f $(METAS)
+
+dist-clean: clean
+       rm -f Makefile configure config.log config.cache config.status
+
+$(MODULES:%=%.all):
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) ; make all
+$(MODULES:%=%.opt):
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) ; make opt
+$(MODULES:%=%.depend):
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) ; make depend
+$(MODULES:%=%.install):
+       cd $(@:%.install=%) ; make install
+$(MODULES:%=%.uninstall):
+       cd $(@:%.uninstall=%) ; make uninstall
+$(MODULES:%=%.clean):
+       cd $(@:%.clean=%) ; make clean
+META.helm-%: META.helm-%.src
+       cp $< $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@

diff --git a/helm/ocaml/configure.in b/helm/ocaml/configure.in
new file mode 100644 (file)
index 0000000..715a9d1
--- /dev/null
+++ b/helm/ocaml/configure.in
@@ -0,0 +1,15 @@
+AC_INIT(Makefile.common)
+
+AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
+if test $HAVE_OCAMLC = "no"; then
+  AC_MSG_ERROR(could not find ocamlc in PATH, please make sure ocaml is installed)
+fi
+
+AC_CHECK_PROG(HAVE_OCAMLFIND, ocamlfind, yes, no)
+if test $HAVE_OCAMLFIND = "no"; then
+  AC_MSG_ERROR(could not find ocamlfind in PATH, please make sure findlib is installed)
+fi
+
+AC_OUTPUT([
+  Makefile
+])