From d651bf2e3d560e194fbe948dd950dd600a40eab6 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 20 Apr 2004 09:41:10 +0000 Subject: [PATCH] added ocamlfind library checks to configure.ac --- helm/matita/Makefile.in | 2 +- helm/matita/configure.ac | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in index 02686b0fb..c784b0be6 100644 --- a/helm/matita/Makefile.in +++ b/helm/matita/Makefile.in @@ -2,8 +2,8 @@ OCAMLFIND = @OCAMLFIND@ CAMLP4O = @CAMLP4O@ LABLGLADECC = @LABLGLADECC@ +REQUIRES = @FINDLIB_REQUIRES@ -REQUIRES = lablgtk2.glade helm-registry OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O) OCAML_THREADS_FLAGS = -thread OCAML_DEBUG_FLAGS = diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac index cc0c50349..cc8d14a13 100644 --- a/helm/matita/configure.ac +++ b/helm/matita/configure.ac @@ -6,14 +6,12 @@ if test $HAVE_OCAMLFIND = "yes"; then else AC_MSG_ERROR(could not find ocamlfind) fi - AC_CHECK_PROG(HAVE_LABLGLADECC, lablgladecc2, yes, no) if test $HAVE_LABLGLADECC = "yes"; then LABLGLADECC="lablgladecc2" 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" @@ -21,9 +19,21 @@ else AC_MSG_ERROR(could not find camlp4o) fi +FINDLIB_REQUIRES="lablgtk2.glade helm-registry" +for r in $FINDLIB_REQUIRES +do + AC_MSG_CHECKING(for $r ocaml library) + if $OCAMLFIND query $r &> /dev/null; then + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR(could not find $r ocaml library) + fi +done + AC_SUBST(OCAMLFIND) AC_SUBST(CAMLP4O) AC_SUBST(LABLGLADECC) +AC_SUBST(FINDLIB_REQUIRES) AC_OUTPUT([ buildTimeConf.ml -- 2.39.2