From a6611bb09e2fa8629a022dbcd6c527ea8fd4df32 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Wed, 28 Nov 2001 11:36:49 +0000 Subject: [PATCH] configure.in now used (just to check that ocaml and findlib are there) Very small bug-fixes. --- helm/ocaml/.cvsignore | 15 ++++++++++++++- helm/ocaml/Makefile.common | 1 - helm/ocaml/{Makefile => Makefile.in} | 5 +++-- helm/ocaml/configure.in | 15 +++++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) rename helm/ocaml/{Makefile => Makefile.in} (91%) create mode 100644 helm/ocaml/configure.in diff --git a/helm/ocaml/.cvsignore b/helm/ocaml/.cvsignore index 68dd36db7..d69218dfc 100644 --- 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.common b/helm/ocaml/Makefile.common index b7eefedbc..84a252e94 100644 --- 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 b/helm/ocaml/Makefile.in similarity index 91% rename from helm/ocaml/Makefile rename to helm/ocaml/Makefile.in index d983eea74..83b28f78c 100644 --- a/helm/ocaml/Makefile +++ b/helm/ocaml/Makefile.in @@ -13,6 +13,9 @@ 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): @@ -25,7 +28,5 @@ $(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/configure.in b/helm/ocaml/configure.in new file mode 100644 index 000000000..715a9d105 --- /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 +]) -- 2.39.2